zmagod f8a3fca2db Merge branch 'master' of https://github.com/biosistemika/scinote-web into decoupling		2018-01-23 11:06:33 +01:00
..
addons	Revert "Revert "Add Add-ons page to User -> Settings -> Account [SCI-1675]""	2017-10-17 13:17:49 +02:00
preferences	Fix notification settings accessors [SCI-1864]	2017-12-13 11:59:53 +01:00
_navigation.html.erb	Pull latest master into gilson-iot-rails4	2017-11-15 15:15:26 +01:00