Merge remote-tracking branch 'origin/feature/capabilities-1.15' into …

…feature/capabilities-1.15 Conflicts: assets/css/admin-global.css assets/css/scss/admin-global.scss includes/class-gravityview-roles-capabilities.php
GravityKit · Oct 8, 2015 · 4da5ee5 · 4da5ee5
2 parents e6cd9e0 + 028b251
commit 4da5ee5
Show file tree

Hide file tree

Showing 16 changed files with 138 additions and 414 deletions.
diff --git a/assets/css/admin-global.css b/assets/css/admin-global.css