snipe ca24ef1cd8 Merge branch 'refs/heads/feature/add-asset-to-software' into develop ...

Conflicts:
	app/controllers/admin/LicensesController.php

2014-07-18 20:24:51 -04:00

..

categories

Updated spacing for PSR-2

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

depreciations

Updated spacing for PSR-2

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

groups

Updated spacing for PSR-2

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

hardware

Added language string for requestable field

2014-07-09 10:34:54 -04:00

licenses

Merge branch 'refs/heads/feature/add-asset-to-software' into develop

2014-07-18 20:24:51 -04:00

locations

Updated spacing for PSR-2

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

manufacturers

Updated spacing for PSR-2

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

models

Updated spacing for PSR-2

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

settings

Updated spacing for PSR-2

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

statuslabels

Updated spacing for PSR-2

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

suppliers

Updated spacing for PSR-2

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

users

Added admin ability to unsuspend locked accounts #changelog

2014-07-16 18:21:22 -04:00