snipe 5ff75e7f42 Merge remote-tracking branch 'origin/develop-bootstrap-tables-integration' into develop ...

# Conflicts:
#	app/controllers/admin/CategoriesController.php
#	app/views/backend/accessories/view.blade.php
#	app/views/backend/categories/index.blade.php
#	app/views/backend/settings/edit.blade.php

2015-10-21 23:06:43 -07:00

..

admin

Merge remote-tracking branch 'origin/develop-bootstrap-tables-integration' into develop

2015-10-21 23:06:43 -07:00

auth

Updated language files

2015-07-27 10:25:35 -07:00

button.php

Request button strings

2015-07-30 14:52:55 -07:00

general.php

LDAP UI language strings

2015-08-14 20:15:24 -07:00

pagination.php

Updated spacing for PSR-2

2014-06-24 17:49:39 -04:00

reminders.php

Updated spacing for PSR-2

2014-06-24 17:49:39 -04:00

table.php

Item language string

2015-02-25 16:38:05 -08:00

validation.php

Updated language files

2015-07-27 10:25:35 -07:00