bubnikv e845f3b864 Merge branch 'master' into profile_inheritance		2018-03-13 13:49:23 +01:00
..
icons	Added lock and lock_open icons.	2018-03-13 13:39:46 +01:00
localization	Merge remote-tracking branch 'remotes/origin/gui_improvements'	2018-03-05 12:12:40 +01:00
profiles	Merge branch 'master' into profile_inheritance	2018-03-13 13:49:23 +01:00