Merge branch 'prerelease' into maintenance

This commit is contained in:
Gina Häußge 2016-06-08 11:21:22 +02:00
commit d3d4d4e407

View file

@ -7,8 +7,10 @@
# The file is processed from top to bottom, the first matching line wins. If <tag> or <reference commit> are left out,
# the lookup table does not apply to the matched branches
# master shall not use the lookup table, only tags
# master, prerelease and rc shall not use the lookup table, only tags
master
prerelease
rc
# neither should disconnected checkouts, e.g. 'git checkout <tag>'
HEAD