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

..

bulk.blade.php

Fixes bug in #736 for new fields

2015-05-04 11:14:38 -07:00

checkin.blade.php

update icon

2015-03-10 13:31:04 +10:30

checkout.blade.php

update icon

2015-03-10 13:30:31 +10:30

clone.blade.php

update icon

2015-03-10 13:29:57 +10:30

datatable.blade.php

Basic QR code printing

2015-03-19 18:06:50 -07:00

edit.blade.php

Fixes for #722 localization

2015-04-02 14:28:11 -07:00

index.blade.php

Fixes for #722 datatables

2015-04-02 14:55:36 -07:00

labels.blade.php

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

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

view.blade.php

Fixes #799 - missing text in file delete confirmation

2015-05-14 20:52:19 -07:00