Merge branch 'master' of bitbucket.org:code2lab/nemo_encoder

2017-03-08 14:08:26 +06:30
parent 01a2c617c5 4a094775b7
commit 6387d48b63
22 changed files with 2196 additions and 55 deletions
--- a/config/database.yml
+++ b/config/database.yml
@@ -23,4 +23,6 @@ test:

 production:
  <<: *default
-  database: db/production.sqlite3
+  database: nemo
+  username: deploy
+  password: OU771o3ja3Hn4$r