maintenance branch is now 1.2.5-dev

This commit is contained in:
Gina Häußge 2015-07-23 12:19:27 +02:00
parent 9a6099ffc2
commit 1f0dbf8f7f

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.4
# maintenance is currently the branch for preparation of maintenance release 1.2.5
# so are any fix/... branches
maintenance 1.2.4-dev 3761995aff94acf32495556730f133a1626245b3
fix/.* 1.2.4-dev 3761995aff94acf32495556730f133a1626245b3
maintenance 1.2.5-dev 9a6099ffc2982455d631c9d68a3273d9eb55885c
fix/.* 1.2.5-dev 9a6099ffc2982455d631c9d68a3273d9eb55885c
# every other branch is a development branch and thus gets resolved to 1.3.0-dev for now
.* 1.3.0-dev 198d3450d94be1a2