Xenia bac8786ab4 Merge remote-tracking branch 'origin/developer' into developer ...

# Conflicts:
#	public/routes/home.js
#	public/style/style.css
#	public/style/style.less

2019-07-23 17:38:11 +02:00

..

style.css

Merge remote-tracking branch 'origin/developer' into developer

2019-07-23 17:38:11 +02:00

style.less

Merge remote-tracking branch 'origin/developer' into developer

2019-07-23 17:38:11 +02:00