Merge branch 'master' of https://github.com/taobataoma/meanTorrent

Browse Source

* 'master' of https://github.com/taobataoma/meanTorrent:
  cfg(torrents): new app configure settings of app.domain
  cfg(torrents): new app configure settings of app.domain
  cfg(torrents): new app configure settings of app.domain
  chg(vip): disable payment event
  cfg(core): config global SIGN settings
  cfg(core): config global HOST settings
  conf(config): config settings for hello.pt
  conf(config): config settings for hello.pt
  conf(config): config settings for hello.pt
  doc(readme): update readme.md
  add ignored file

# Conflicts:
#	README.md
#	config/env/development.js
#	config/env/production.js
#	config/env/torrents.js

...

This commit is contained in:

OldHawk

2018-03-12 00:23:10 +08:00

parent fc7ac99692 1700694084

commit 2d0fd22fa3

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Download Patch File Download Diff File Expand all files Collapse all files

Diff Content Not Available