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

..

img

Reduce size of images (save 454 B)

2017-10-07 18:52:43 +02:00

pages

[translations] update some

2018-10-28 18:20:55 +01:00

advanced.json

add applications utility

2018-08-22 18:33:43 +02:00

default.json

add applications utility

2018-08-22 18:33:43 +02:00

preferences.json

Application utility

2018-09-23 13:49:19 +02:00