Luka Murn 8254153bb9 Merge branch 'master' into rails-5.1 ... Conflicts: Gemfile Gemfile.lock app/models/connection.rb app/models/experiment.rb app/models/my_module.rb		2017-10-23 08:57:57 +02:00
..
images	adds images into assets folder	2017-06-29 11:04:31 +02:00
javascripts	Merge branch 'master' into rails-5.1	2017-10-23 08:57:57 +02:00
stylesheets	Improve error handling in file uploads [SCI-1609][SCI-1612][SCI-1551]	2017-10-19 11:38:23 +02: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