Merge branch 'stable' into develop

This commit is contained in:
Jonne Haß 2016-04-27 11:56:12 +02:00
commit 32fdec4493
No known key found for this signature in database
GPG key ID: F347E0EB47AC70D6

View file

@ -30,6 +30,6 @@ script: "./script/ci/build.sh"
notifications:
irc:
channels:
- "irc.freenode.org:6667#diaspora-dev"
- secure: YvYkeTAw+5oOl/RaXVwu7JkKGNWPoFosNQRmLvJkBFbWzZ1s5LZD1u3+Qj819bT3lGzJu9pxmJg765IRYrGWmBi4mcAV3dpO6qowVdFTcorf0JsnLw3Kvkga9rrDunsRNr21KTAQqHOO5mKUzw9DtMzd52BiWuZwIj3xcl72gQI=
template:
- "%{repository_slug}#%{commit} (%{branch} - %{commit_subject}): %{message} %{build_url}"