snipe 9091385182 Merge branch 'hotfixes/purchase_cost' into develop ...

# Conflicts:
#	app/Http/Controllers/ReportsController.php
#	config/version.php

2016-09-27 19:13:21 -07:00

..

assets

Removed console message from JS

2016-08-01 21:43:56 -07:00

lang

Translate emails (#2652)

2016-09-26 14:13:07 -07:00

macros

Hide radio and checkboxes for now

2016-08-25 19:48:11 -07:00

views

Merge branch 'hotfixes/purchase_cost' into develop

2016-09-27 19:13:21 -07:00