FreneticScribbler 858b297929 Merge branch 'master' into markdown ...

# Conflicts:
#	RIGS/static/css/print.css
#	RIGS/static/css/screen.css
#	RIGS/static/scss/screen.scss
#	RIGS/templates/RIGS/event_print_page.xml
#	RIGS/test_unit.py
#	requirements.txt

2019-11-27 20:38:43 +00:00

..

css

Only display embedded scrollbars when required

2019-10-30 13:16:14 +00:00

fonts

Updated bootstrap asset files to V3.3.3

2015-01-22 18:52:32 +00:00

imgs

[ImgBot] optimizes images (#339)

2018-08-19 19:08:35 +01:00

js

Merge branch 'master' into markdown

2019-11-27 20:38:43 +00:00

scss

Merge branch 'master' into markdown

2019-11-27 20:38:43 +00:00

config.rb

Fixed compass config

2016-03-16 12:16:57 +00:00