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

..

AssetsController.php

Fixed bug with edit (supplier_id), added requestable field for assets

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

CategoriesController.php

Updated spacing for PSR-2

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

DashboardController.php

Updated spacing for PSR-2

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

DepreciationsController.php

Updated spacing for PSR-2

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

GroupsController.php

Updated spacing for PSR-2

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

LicensesController.php

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

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

LocationsController.php

Updated spacing for PSR-2

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

ManufacturersController.php

Updated spacing for PSR-2

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

ModelsController.php

Updated spacing for PSR-2

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

SettingsController.php

Updated spacing for PSR-2

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

StatuslabelsController.php

Updated spacing for PSR-2

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

SuppliersController.php

Updated spacing for PSR-2

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

UsersController.php

Added admin ability to unsuspend locked accounts #changelog

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