wmcheng 6970c099cf Merge branch 'master' into 'revert-e1e90a83' ... # Conflicts: # app/controllers/property_hires_controller.rb		2019-11-08 18:53:50 +08:00
..
admin	added auto approve and users can delete the entries	2018-02-05 17:15:50 +08:00
property_hires_controller.rb	Merge branch 'master' into 'revert-e1e90a83'	2019-11-08 18:53:50 +08:00