Merge branch 'development' del3
authorDominik <muggd1@bfh.ch>
Sun, 29 Nov 2015 12:10:53 +0000 (13:10 +0100)
committerDominik <muggd1@bfh.ch>
Sun, 29 Nov 2015 12:10:53 +0000 (13:10 +0100)
commit9bf3a22f65d80ec25c361112ca487dca51f281ba
tree5d403483d180d09022e8a93100c9b6e48a96f6a2
parentef1bb9c2d1bd73fee5cb1ec47696fb5c85ae8511
parent802092f34a315d56516c5bf58d1ac75803f54fe8
Merge branch 'development'

Conflicts:
src/site/apt/sprint_backlog.apt
.gitignore
.project
README.md
src/checkstyle/checkstyle-configuration.xml
src/checkstyle/checkstyle-header.txt
src/site/apt/format.apt
src/site/apt/index.apt
src/site/apt/sprint_backlog.apt
src/site/fml/faq.fml
src/site/resources/images/fig_example.svg
src/site/resources/images/fig_example.uxf