Merge remote-tracking branch 'upstream/develop'

project.clj

@@ -1,4 +1,4 @@
-(defproject smeagol "1.0.2-SNAPSHOT"
+(defproject smeagol "1.0.2"
   :description "A simple Git-backed Wiki inspired by Gollum"
   :url "https://github.com/simon-brooke/smeagol"
   :license {:name "GNU General Public License,version 2.0 or (at your option) any later version"
@@ -63,7 +63,7 @@
   :release-tasks [["vcs" "assert-committed"]
                   ["change" "version" "leiningen.release/bump-version" "release"]
                   ["vcs" "commit"]
-                  ;; ["vcs" "tag"] -- not working, problems with secret key
+                  ["vcs" "tag" "v." "--no-sign"]
                   ["clean"]
                   ["bower" "install"]
                   ["ring" "uberjar"]

resources/public/content/Change log.md

@@ -0,0 +1,7 @@
+# 1.0.2
+Two fixes contributed by a user:
+
+* [Configurable start page](https://github.com/journeyman-cc/smeagol/commit/b1eeecde1d0555e9b708807c63e28fac21de58c4)
+* [Fixed uploads](https://github.com/journeyman-cc/smeagol/commit/1136e792d4810fd9af8b443fdea6d6be4aeda79e)
+
+Many thanks to [M Jerger](https://github.com/jerger) for these.

resources/public/content/_side-bar.md

@@ -1,4 +1,5 @@
 * [[Introduction]]
+* [[Change log]]
 * [[User Documentation]]
 * [[Deploying Smeagol]]
 * [[Developing Smeagol]]