summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJoel Rosdahl <joel@rosdahl.net>2017-05-22 22:07:34 +0200
committerJoel Rosdahl <joel@rosdahl.net>2017-05-22 22:07:34 +0200
commit2d4e489881dfee3c0ecea7609de89fee4cace224 (patch)
treea76da0332b698c9d867eb711b7a4dbadfaf2fa2c
parentc85d77c905884e875921a7e503842a0f313b322e (diff)
downloadminiircd-2d4e489881dfee3c0ecea7609de89fee4cace224.tar.gz
miniircd-2d4e489881dfee3c0ecea7609de89fee4cace224.zip
Prepare for v1.2
-rw-r--r--CHANGES2
-rw-r--r--README.md4
-rwxr-xr-xminiircd2
3 files changed, 5 insertions, 3 deletions
diff --git a/CHANGES b/CHANGES
index d2c1a83..f4730f6 100644
--- a/CHANGES
+++ b/CHANGES
@@ -1,4 +1,4 @@
-Unreleased
+1.2 (2017-05-22)
* Find certificate specified with relative path when using --daemon.
* Handle quickly disconnecting client without crashing.
diff --git a/README.md b/README.md
index ea8005a..24e6db9 100644
--- a/README.md
+++ b/README.md
@@ -102,9 +102,11 @@ Contributors
------------
- Alex Wright
+- Braxton Plaxco
+- Hanno Foest
- Jan Fuchs
+- Julien Monnier
- Leandro Lucarella
-- Hanno Foest
- Martin Maney
- Matt Baxter
- Matt Behrens
diff --git a/miniircd b/miniircd
index ba63820..0516ea8 100755
--- a/miniircd
+++ b/miniircd
@@ -33,7 +33,7 @@ from datetime import datetime
from logging.handlers import RotatingFileHandler
from optparse import OptionParser
-VERSION = "1.1"
+VERSION = "1.2"
PY3 = sys.version_info[0] >= 3