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

..

backups.blade.php

Fixed typo

2015-09-22 20:22:21 -07:00

edit.blade.php

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

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

index.blade.php

fixes lang option for remote script

2015-10-12 21:00:27 +02:00