Merge pull request #4 from previewict/development

Take update from development branch
PreviewTechnologies · May 12, 2015 · c54f357 · c54f357
2 parents 1f6f9d2 + 248f063
commit c54f357
Show file tree

Hide file tree

Showing 13 changed files with 2,725 additions and 9 deletions.
diff --git a/.gitignore b/.gitignore
@@ -2,15 +2,7 @@
 tmp/*
 .DS_STORE
 composer.lock
-
-/propel/*
-!/propel/propel.sample
-!/propel/runtime-conf.sample
-!/propel/schema.sample
-!/propel/generated-classes/.gitkeep
-
-
-
+propel/generated-conf/config.php
 /tmp/*
 
 .idea/*
diff --git a/README.md b/README.md
@@ -34,6 +34,8 @@ sudo ../vendor/propel/propel/bin/propel config:convert
 * Again go to your project root and make `/tmp` writable
 ```bash
 cd /var/www/yourprojectdirectory
+#need once more composer install command to autoload newly generated propel classmap
+sudo composer install
 sudo chmod 777 tmp/ -R
 ```