Merge branch 'master' into develop

This commit is contained in:
Devin Howard 2016-02-06 12:55:02 +08:00
commit e4d53162a7
9 changed files with 1 additions and 0 deletions

1
.gitignore vendored
View file

@ -7,6 +7,7 @@
#assety stuff #assety stuff
realtime/node_modules realtime/node_modules
public/assets public/assets
vendor/
#secrets and config #secrets and config
.env .env

0
public/404.html Executable file → Normal file
View file

0
public/422.html Executable file → Normal file
View file

0
public/500.html Executable file → Normal file
View file

0
public/503.html Executable file → Normal file
View file

0
public/famous/main.js Executable file → Normal file
View file

0
public/famous/templates.js Executable file → Normal file
View file

0
public/favicon.ico Executable file → Normal file
View file

Before

Width:  |  Height:  |  Size: 894 B

After

Width:  |  Height:  |  Size: 894 B

0
public/robots.txt Executable file → Normal file
View file