Merge branch 'master' into develop

2016-02-06 12:55:02 +08:00 · 2016-02-06 12:55:02 +08:00 · e4d53162a7
commit e4d53162a7
parent 798035107f f9128dad7a
9 changed files with 1 additions and 0 deletions
--- a/.gitignore
+++ b/.gitignore
@ -7,6 +7,7 @@
 #assety stuff
 realtime/node_modules
 public/assets
 vendor/
 #secrets and config
 .env
--- a/public/404.html
+++ b/public/404.html
--- a/public/422.html
+++ b/public/422.html
--- a/public/500.html
+++ b/public/500.html
--- a/public/503.html
+++ b/public/503.html
--- a/public/famous/main.js
+++ b/public/famous/main.js
--- a/public/famous/templates.js
+++ b/public/famous/templates.js
--- a/public/favicon.ico
+++ b/public/favicon.ico
--- a/public/robots.txt
+++ b/public/robots.txt