Frede Hundewadt 3460747edb Merge remote-tracking branch 'upstream/master' ... # Conflicts: # data/preferences.json # src/manjaro_hello.py # ui/manjaro-hello.glade		2018-10-30 16:46:56 +01:00
..
__init__.py	Application utility	2018-09-23 13:49:19 +02:00
app-install	add applications utility	2018-08-22 18:33:43 +02:00
app-utility	add applications utility	2018-08-22 18:33:43 +02:00
manjaro_hello.py	Merge remote-tracking branch 'upstream/master'	2018-10-30 16:46:56 +01:00