Update v1.0.6

2016-02-16 23:22:09 +05:30
parent 62d04a0372
commit c710c20b9e
7620 changed files with 244752 additions and 1070312 deletions
--- a/.env
+++ b/.env
@@ -2,9 +2,15 @@ APP_ENV=local
 APP_DEBUG=true
 APP_KEY=SomeRandomString
 DB_HOST=localhost
+<<<<<<< Updated upstream
 DB_DATABASE=faveo1.0.6
 DB_USERNAME=root
 DB_PASSWORD=
+=======
+DB_DATABASE=faveo-github
+DB_USERNAME=bhanu
+DB_PASSWORD=bhanu
+>>>>>>> Stashed changes
 CACHE_DRIVER=file
 SESSION_DRIVER=file
 QUEUE_DRIVER=sync