scinote-web/app/assets/images
Luka Murn cf72da5635 Merge branch 'improved-files-handling' into 'master'
Conflicts:
	app/assets/javascripts/protocols/steps.js.erb
	app/helpers/assets_helper.rb
	db/schema.rb
2017-01-18 11:29:40 +01:00
..
custom
icon
icon_small
medium clear unneeded css, change processing image [fixes SCI-758] 2016-12-09 14:24:20 +01:00
thumb
.keep
logo.png