okriuchykhin e7fb1bc716 Merge pull request #967 from okriuchykhin/ok_SCI_1966 ... Merge gilson-iot-rails4 to master [SCI-1966]		2018-02-12 11:02:17 +01:00
..
assets
controllers	Merge pull request #967 from okriuchykhin/ok_SCI_1966	2018-02-12 11:02:17 +01:00
datatables
helpers	Fixed newline styling, now code is styled in newlines, and since \n doesnt work i change it to <br> with gsub and that allows code to be written into multiple lines	2018-02-07 14:46:25 +01:00
javascript
mailers
models
permissions
serializers
services
utilities
views	Merge pull request #990 from Zanz2/code_formatting_sci1822	2018-02-08 08:52:44 +01:00