snipe b492ac4950 Merge branch 'bootstrap-table-experiment' into develop-bootstrap-tables-integration ...

# Conflicts:
#	.gitignore
#	app/controllers/admin/AccessoriesController.php
#	app/controllers/admin/AssetsController.php
#	app/controllers/admin/LicensesController.php
#	app/models/Accessory.php
#	app/models/Asset.php
#	app/routes.php
#	app/views/backend/accessories/index.blade.php
#	app/views/backend/accessories/view.blade.php
#	app/views/backend/hardware/index.blade.php
#	app/views/backend/licenses/index.blade.php

2015-10-20 17:52:02 -07:00

..

assets

Merge branch 'bootstrap-table-experiment' into develop-bootstrap-tables-integration

2015-10-20 17:52:02 -07:00

img

Change IMG Path

2015-03-13 17:36:51 +10:30

packages

Initial laravel import

2013-11-13 01:59:39 -05:00

uploads

Add image to supplier

2014-11-07 13:46:14 +10:30

.htaccess

Added mod rewrite to force SSL

2015-07-16 20:32:10 -07:00

favicon.ico

Initial laravel import

2013-11-13 01:59:39 -05:00

index.php

Updated spacing for PSR-2

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

robots.txt

Exclude Snipe-IT from search engines

2015-08-11 14:19:51 -07:00