Merge branch '2015.11-develop' into 2016.03
[tine20] / .gitattributes
2016-07-11 Philipp SchüleMerge branch '2015.11-develop' into 2016.03
2016-07-11 Philipp SchüleMerge branch '2015.11' into 2015.11-develop
2016-07-11 Philipp SchüleMerge branch '2014.11' into 2015.11
2016-07-11 Cornelius Weiß0011852: add git merge driver for po/pot files