Alexander Bruy b9d5b2c452 fix conflicts

2016-10-20 11:28:28 +03:00

..

after_script.sh

…

before_install.sh

fix conflicts

2016-10-20 11:28:28 +03:00

before_script.sh

…

blacklist.txt

[composer] Allow syncing pictures to true north

2016-10-18 13:45:52 +10:00

install.sh

…

script.sh

fix conflicts

2016-10-20 11:28:28 +03:00