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

..

commands

Updated spacing for PSR-2

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

config

Updated spacing for PSR-2

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

controllers

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

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

database

More edits for #140

2014-07-17 13:38:53 -04:00

lang/en

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

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

models

Fixed #140

2014-07-18 20:09:58 -04:00

start

Changed country to dropdown

2014-07-11 19:12:53 -04:00

storage

Handle logs/views dir better

2014-01-28 18:05:15 -05:00

tests

Updated spacing for PSR-2

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

views

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

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

filters.php

Updated spacing for PSR-2

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

macros.php

Changed country to dropdown

2014-07-11 19:12:53 -04:00

routes.php

Added admin ability to unsuspend locked accounts #changelog

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

validators.php

Updated spacing for PSR-2

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