snipe 0728a991a8 Merge branch 'hotfixes/datepicker_for_date_custom_field' into develop ... # Conflicts: # resources/views/models/custom_fields_form.blade.php		2016-10-25 05:18:55 -07:00
..
custom_fields_form.blade.php	Use datepicker if custom field format is a date	2016-10-25 05:16:41 -07:00
edit.blade.php	Fix mismerged code. (#2705)	2016-09-28 22:57:19 -07:00
index.blade.php	Fix exports (#2338)	2016-07-27 19:45:45 -07:00
view.blade.php	Fixes #2768 and #2753	2016-10-12 12:48:37 -07:00