fix conflict in phpfspot.class.php

[phpfspot.git] / CHANGELOG

diff --git a/CHANGELOG b/CHANGELOG
index 28288cff56cc8919f93d906e94e5fabc059d0e24..1ff2c36163fac774bba692456563fc61bb170663 100644 (file)
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,3 +1,9 @@
+phpfspot (1.7)
+
+ * feature, F-Spot photo versioning
+
+ -- Andreas Unterkircher <unki@netshadow.at>  Fri, 18 Aug 2008 06:09:00 +0200
+
 phpfspot (1.6)
 
  * bug, sort-by rates if all photos of the library are displayed works now.