maintenance branch is now 1.2.2-dev

This commit is contained in:
Gina Häußge 2015-06-30 10:11:17 +02:00
parent 9f8d30a66c
commit 0b3f94b6bd

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.1
# maintenance is currently the branch for preparation of maintenance release 1.2.2
# so are any fix/... branches
maintenance 1.2.1-dev cfa4cb2a7c5f1af10dc8
fix/.* 1.2.1-dev cfa4cb2a7c5f1af10dc8
maintenance 1.2.2-dev 9f8d30a66c2fcc5cd0e8984c72dc36f7e84fde10
fix/.* 1.2.2-dev 9f8d30a66c2fcc5cd0e8984c72dc36f7e84fde10
# every other branch is a development branch and thus gets resolved to 1.3.0-dev for now
.* 1.3.0-dev 198d3450d94be1a2