aboutsummaryrefslogtreecommitdiff
path: root/ChangeLog
diff options
context:
space:
mode:
authorJustin J. Novack <jnovack@gmail.com>2012-09-17 10:08:39 -0400
committerJustin J. Novack <jnovack@gmail.com>2012-09-17 10:08:39 -0400
commit97c4ac59eed8b66b2e7f85d8ac325b063fb8a0ce (patch)
treed6c729c5ad14562eff5b63f782f1428a5c964bb5 /ChangeLog
parent76aa2ab76d8f2305db7a2bb7cdbe461cca0146a3 (diff)
parent882ce78e4fc3361288dbc3c453412556aa529c7d (diff)
downloadphorkie-97c4ac59eed8b66b2e7f85d8ac325b063fb8a0ce.tar.gz
phorkie-97c4ac59eed8b66b2e7f85d8ac325b063fb8a0ce.zip
Merge with updates from cweiske/master
Diffstat (limited to 'ChangeLog')
-rw-r--r--ChangeLog6
1 files changed, 5 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog
index 35e7456..4a9cfc5 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,7 +1,11 @@
-2012-09-16 Justin J. Novack <jnovack@gmail.com>
+2012-09-17 Justin J. Novack <jnovack@gmail.com>
* Add OpenID authentication
+2012-09-16 Christian Weiske <cweiske@cweiske.de>
+
+ * Implement request #12: DOAP documents for all pastes
+
2012-09-08 Christian Weiske <cweiske@cweiske.de>
* Fix bug #11: do not index edit, delete and tool pages