Luka Murn cf291bf887 Merge branch 'gilson-iot-rails4' ... Conflicts: Gemfile.lock		2017-12-19 10:56:39 +01:00
..
assets	quick fix un-needed styling	2017-12-10 01:45:47 +01:00
controllers	Merge branch 'gilson-iot-rails4'	2017-12-19 10:56:39 +01:00
datatables	Add ordering for column mappings in repositories	2017-07-26 13:35:54 +02:00
helpers	Merge pull request #806 from ZmagoD/disable_tiny_mce_asset_unless_step	2017-12-12 09:53:24 +01:00
mailers
models	Merge branch 'gilson-iot-rails4'	2017-12-19 10:56:39 +01:00
services	Pull latest master into gilson-iot-rails4	2017-11-15 15:15:26 +01:00
utilities	remove unneeded comment and add tiny_mce_asset regex in a constant	2017-11-24 17:04:01 +01:00
views	Merge branch 'gilson-iot-rails4'	2017-12-19 10:56:39 +01:00