Merge branch 'release/0.5.0'

EdRands · Jan 4, 2014 · 50938ce · 50938ce
2 parents 35e2915 + 0f6c170
commit 50938ce
Show file tree

Hide file tree

Showing 64 changed files with 6,772 additions and 1,796 deletions.
diff --git a/.gitignore b/.gitignore
@@ -6,9 +6,6 @@
 Thumbs.db
 ehthumbs.db
 
-# Folder config file
-desktop.ini
-
 # Recycle Bin used on file shares
 $RECYCLE.BIN/
 
@@ -41,6 +38,11 @@ composer.phar
 #############
 /nbproject/private/
 
+#############
+## PhpStorm IDE
+#############
+/.idea/workspace.xml
+
 
 #############
 ## Project

diff --git a/.idea/.name b/.idea/.name
diff --git a/.idea/Enhanced Laravel Seeder.iml b/.idea/Enhanced Laravel Seeder.iml
diff --git a/.idea/bashsupport_project.xml b/.idea/bashsupport_project.xml
diff --git a/.idea/codeStyleSettings.xml b/.idea/codeStyleSettings.xml