re-merge master branch

pingpong-labs · May 9, 2015 · 4322305 · 4322305
1 parent 5128984
commit 4322305
Show file tree

Hide file tree

Showing 9 changed files with 2 additions and 276 deletions.
diff --git a/.travis.yml b/.travis.yml
diff --git a/Entities/Permission.php b/Entities/Permission.php
diff --git a/Entities/Role.php b/Entities/Role.php
diff --git a/README.md b/README.md
@@ -1,4 +1,4 @@
 Trusty
-=======
+==============
 
-Official documentation is located [here](http://sky.pingpong-labs.com/docs/2.0/trusty)
+Official documentation is located [here](http://sky.pingpong-labs.com/docs/2.0/trusty)
diff --git a/phpunit.xml b/phpunit.xml
diff --git a/src/migrations/2014_05_02_051938_create_roles_table.php b/src/migrations/2014_05_02_051938_create_roles_table.php
diff --git a/src/migrations/2014_05_02_052125_create_permissions_table.php b/src/migrations/2014_05_02_052125_create_permissions_table.php
diff --git a/src/migrations/2014_05_02_052410_create_role_user_table.php b/src/migrations/2014_05_02_052410_create_role_user_table.php
diff --git a/src/migrations/2014_05_02_092851_create_permission_role_table.php b/src/migrations/2014_05_02_092851_create_permission_role_table.php