HJ 215662afde Merge branch 'develop' into 'fix-move-type-notification' ... # Conflicts: # static/fontello.json		2020-01-03 09:05:48 +00:00
..
settings.js	Some error handling	2019-12-26 14:12:35 +02:00
settings.vue	Merge branch 'develop' into 'fix-move-type-notification'	2020-01-03 09:05:48 +00:00