Merge branch 'prerelease' into maintenance

Cabalist · Jun 8, 2016 · d3d4d4e · d3d4d4e
2 parents 5006b01 + e9f80c6
commit d3d4d4e
Showing 1 changed file with 3 additions and 1 deletion.
diff --git a/.versioneer-lookup b/.versioneer-lookup
@@ -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