snipe 123caf42c2 Merge remote-tracking branch 'origin/develop' into 1.3.0 ...

# Conflicts:
#	app/views/backend/hardware/labels.blade.php
#	app/views/backend/layouts/default.blade.php

2015-05-27 11:17:14 -07:00

..

migrations

Merge remote-tracking branch 'origin/develop' into 1.3.0

2015-05-27 11:17:14 -07:00

seeds

Fix for bad seed data if Jon Doe doesn't get created

2015-04-01 17:22:48 -07:00

production.sqlite

Initial laravel import

2013-11-13 01:59:39 -05:00