Ertuğrul Erata 122f1bf40c fix file conflicts:wq

2017-02-20 13:28:14 +02:00

..

comar

…

files

…

actions.py

fix file conflicts:wq

2017-02-20 13:28:14 +02:00

pspec.xml

…

translations.xml

…