wmcheng 6970c099cf Merge branch 'master' into 'revert-e1e90a83' ... # Conflicts: # app/controllers/property_hires_controller.rb		2019-11-08 18:53:50 +08:00
..
assets	Update hire_name	2019-07-01 12:14:28 +08:00
controllers	Merge branch 'master' into 'revert-e1e90a83'	2019-11-08 18:53:50 +08:00
helpers/admin	small fix for current property hiring check	2018-01-24 16:51:16 +08:00
models	Update p_hire.rb	2019-11-08 12:24:42 +08:00
views	fix view_calendar recurring & added show recurring_end_date	2018-09-03 17:51:56 +08:00