From: garvinhicking <garvinhicking>
Date: Wed, 29 Aug 2007 19:55:02 +0000 (+0000)
Subject: backport
X-Git-Url: http://git.mjollnir.org/gw?a=commitdiff_plain;h=abd8bd1236271c316a57ffc8fc3be96c7e779afe;p=s9y.git

backport
---

diff --git a/docs/NEWS b/docs/NEWS
index 21ee616..a36313d 100644
--- a/docs/NEWS
+++ b/docs/NEWS
@@ -1,5 +1,11 @@
 # $Id$
 
+Version 1.2.1 ()
+------------------------------------------------------------------------
+
+    * Bulletproof template can now include custom user stylesheets
+      (*_style.css) in the dropdown of a colorset. (garvinhicking)
+
 Version 1.2 (August 26th, 2007)
 ------------------------------------------------------------------------
 
diff --git a/serendipity_config.inc.php b/serendipity_config.inc.php
index 8f4a83a..9f468af 100644
--- a/serendipity_config.inc.php
+++ b/serendipity_config.inc.php
@@ -41,7 +41,7 @@ if (defined('USE_MEMSNAP')) {
 }
 
 // The version string
-$serendipity['version']         = '1.2';
+$serendipity['version']         = '1.2.1';
 
 // Setting this to 'false' will enable debugging output. All alpa/beta/cvs snapshot versions will emit debug information by default. To increase the debug level (to enable Smarty debugging), set this flag to 'debug'.
 $serendipity['production']      = (preg_match('@\-(alpha|beta|cvs)@', $serendipity['version']) ? false : true);