Luka Murn 9f60ece25f Merge branch 'master' into rails-5.1 ... Conflicts: app/models/repository.rb app/models/repository_row.rb app/views/projects/index.html.erb app/views/shared/_secondary_navigation.html.erb		2017-07-06 15:12:15 +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-07-06 15:12:15 +02:00
stylesheets	Fix hound warning [SCI-1356]	2017-06-23 16:19:59 +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