snipe 96bab5697d Merge remote-tracking branch 'origin/develop' ... # Conflicts: # config/version.php # database/migrations/2018_02_22_160436_add_remote_user_settings.php		2018-03-22 09:46:50 -07:00
..
factories	Add default_label field missing in status_labels table (Travis CI) (#5180)	2018-03-21 19:08:06 -07:00
migrations	Merge remote-tracking branch 'origin/develop'	2018-03-22 09:46:50 -07:00
seeds	Truncate the checkout_requests field on seed	2018-01-16 07:36:14 -08:00
.gitignore	Version 3 - hold onto your butts	2016-03-25 01:18:05 -07:00