maintenance branch is now 1.2.6-dev

This commit is contained in:
Gina Häußge 2015-08-31 15:57:11 +02:00
parent 96fc70bdb2
commit ae4e4f22c4

View file

@ -10,10 +10,10 @@
# master shall not use the lookup table, only tags
master
# maintenance is currently the branch for preparation of maintenance release 1.2.5
# maintenance is currently the branch for preparation of maintenance release 1.2.6
# so are any fix/... branches
maintenance 1.2.5-dev 9a6099ffc2982455d631c9d68a3273d9eb55885c
fix/.* 1.2.5-dev 9a6099ffc2982455d631c9d68a3273d9eb55885c
maintenance 1.2.6-dev 96fc70bdb2dd74ba04c3071f70da385b0408904a
fix/.* 1.2.6-dev 96fc70bdb2dd74ba04c3071f70da385b0408904a
# every other branch is a development branch and thus gets resolved to 1.3.0-dev for now
.* 1.3.0-dev 198d3450d94be1a2