Merge branch 'master' into develop

2014-04-11 17:17:20 -05:00
parent c7dff13401 cb21cb8aa8
commit 211dfc24e7
23 changed files with 38 additions and 25 deletions
--- a/app/filters.php
+++ b/app/filters.php
@@ -87,4 +87,4 @@ Route::filter('csrf', function()
 	{
 		throw new Illuminate\Session\TokenMismatchException;
 	}
-});
+});