simon/smeagol
1
0
Fork 0
mirror of https://github.com/journeyman-cc/smeagol.git synced 2026-04-12 18:05:06 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge remote-tracking branch 'upstream/develop'

Browse source
This commit is contained in:
jem 2019-01-25 15:13:19 +01:00
commit 908f47cdff
3 changed files with 10 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

4
project.clj
View file

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

7
resources/public/content/Change log.md Normal file
View file

@ -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.

1
resources/public/content/_side-bar.md
View file

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