Compare commits

...

15 Commits

Author SHA1 Message Date
snipe aecc98b8a3 Merge remote-tracking branch 'origin/develop' 2015-09-11 16:14:20 -07:00
snipe 141bba490f Merge remote-tracking branch 'origin/develop' 2015-09-09 16:40:42 -07:00
snipe 6a08ee1597 Merge remote-tracking branch 'origin/develop' 2015-09-03 19:24:22 -07:00
snipe d3bcf727fb Merge remote-tracking branch 'origin/develop'
# Conflicts:
#	.gitignore
#	app/commands/LicenseImportCommand.php
#	app/config/version.php
#	app/start/artisan.php
2015-08-25 19:48:16 -07:00
snipe 7b0fd2c8f4 Squashed commit of the following:
commit 3dbc9becbc7a5cfe94aae968e52e7c7ed902591b
Author: snipe <snipe@snipe.net>
Date:   Wed Aug 19 17:28:25 2015 -0700

    bumped version

commit e66e2f1ba226274f4d4af4e0772b46762b400653
Author: snipe <snipe@snipe.net>
Date:   Wed Aug 19 17:28:17 2015 -0700

    Added notes to license search
2015-08-19 17:29:42 -07:00
snipe a2bd4250cf Ignore LDAP config 2015-08-19 17:26:08 -07:00
snipe 67e0e14a12 License importer, small fixes for asset imporer 2015-08-14 14:18:51 -07:00
snipe 85a64f9dfd Merge remote-tracking branch 'origin/develop' 2015-08-06 04:00:46 -07:00
snipe a28481cd8f Merge remote-tracking branch 'origin/develop' 2015-07-27 23:10:40 -07:00
snipe a5b2dbfaf0 Merge remote-tracking branch 'origin/develop' 2015-07-23 12:33:26 -07:00
snipe abb970fe39 Merge remote-tracking branch 'origin/develop' 2015-07-17 16:25:55 -07:00
snipe 9ac093e0be Merge remote-tracking branch 'origin/develop' 2015-07-17 14:18:20 -07:00
snipe 61e16a4668 Merge remote-tracking branch 'origin/develop' 2015-07-16 16:25:15 -07:00
snipe dacbdd9aa5 Delete book.json 2015-07-10 19:46:17 -07:00
snipe e1eb2da5f3 Create book.json 2015-07-09 13:32:26 -07:00

Diff Content Not Available