scinote-web/app/assets
Luka Murn 9d3685f872 Merge branch 'gamification' into 'master'
Conflicts:
	app/controllers/users/invitations_controller.rb
	app/controllers/users/settings_controller.rb
2016-11-17 16:30:18 +01:00
..
images
javascripts Merge branch 'gamification' into 'master' 2016-11-17 16:30:18 +01:00
stylesheets Refactoring and added back buttons for tutorial steps 1-5. 2016-11-17 14:46:04 +01:00
tutorial_files If file is recognized as office file, it's allowed to be any office file type. 2016-09-07 14:04:11 +02:00