Luka Murn 26d04b1f3c Merge branch 'rich-text-formatting' into 'master' ... Conflicts: Gemfile.lock app/assets/stylesheets/themes/scinote.scss		2016-11-17 16:39:33 +01:00
..
experiments
my_modules	Fixed tutorial step numbers and changed getting next page reference on protocols page.	2016-11-17 14:46:04 +01:00
projects	Fixed tutorial step numbers and changed getting next page reference on protocols page.	2016-11-17 14:46:04 +01:00
protocols	Merge branch 'rich-text-formatting' into 'master'	2016-11-17 16:39:33 +01:00
reports	Fixed tutorial step numbers and changed getting next page reference on protocols page.	2016-11-17 14:46:04 +01:00
results
samples	Fixed tutorial step numbers and changed getting next page reference on protocols page.	2016-11-17 14:46:04 +01:00
sitewide	Merge branch 'rich-text-formatting' into 'master'	2016-11-17 16:39:33 +01:00
users
application.js.erb	Merge branch 'rich-text-formatting' into 'master'	2016-11-17 16:39:33 +01:00
assets.js
comments.js.erb
custom_fields.js
direct-upload.js
my_modules.js
navigation.js
notifications.js
organizations.js
project_activities.js
sidebar.js.erb
user_my_modules.js