summaryrefslogtreecommitdiff
path: root/propellor.cabal
diff options
context:
space:
mode:
authorJoey Hess2015-02-12 12:35:26 -0400
committerJoey Hess2015-02-12 12:35:26 -0400
commitcb67eb1d08ec4cae991c2933624f12fbb68a7b03 (patch)
treecb0dccfee84fa16ef2343487866d1ca08e146ec3 /propellor.cabal
parent9a26a49f510f6880d1e19ad6e4393e8d54395240 (diff)
parentda77276378ecbed7d6434145793bfb209c731b76 (diff)
Merge branch 'joeyconfig'
Conflicts: privdata.joey/privdata.gpg
Diffstat (limited to 'propellor.cabal')
-rw-r--r--propellor.cabal2
1 files changed, 1 insertions, 1 deletions
diff --git a/propellor.cabal b/propellor.cabal
index 6f4dba2f..41520baa 100644
--- a/propellor.cabal
+++ b/propellor.cabal
@@ -1,5 +1,5 @@
Name: propellor
-Version: 2.0.0
+Version: 2.1.0
Cabal-Version: >= 1.6
License: BSD3
Maintainer: Joey Hess <id@joeyh.name>