From ef7c13fadc7369f89c62d207f5683120ae2f90a1 Mon Sep 17 00:00:00 2001 From: Simon Brooke Date: Thu, 20 Sep 2018 11:23:35 +0100 Subject: [PATCH] Updated release documentation comment. --- CHANGELOG.md | 12 +++++++----- project.clj | 5 ++--- 2 files changed, 9 insertions(+), 8 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index e4b94b3..ebded1d 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,8 +1,11 @@ -# Release 1.4.5 +# Change Log +All notable changes to this project will be documented in this file. This change log is intended to follow the conventions of [keepachangelog.com](http://keepachangelog.com/). + +## Release 1.4.5, 2018-09-20 Generation of skeleton Clojure webapp is now largely complete; this release is not the final 'beta' release of this functionality, but is a dummy run towards that release. -# Release 1.4.1 +## Release 1.4.1 Release 1.4.1 adds a 'magnitude' element to entities, in order to provide a pragma for when to switch to asynchronous select widgets. @@ -10,7 +13,6 @@ to switch to asynchronous select widgets. It also provides a family of transforms, written in Clojure, to generate a skeleton Clojure web app from an ADL specification. -# Release 1.4 +## Release 1.4 -Release 1.4 adds an 'order' element as a possible child of the 'list' element, in order to specify -the default order of lists. Otherwise unchanged from 1.3. +Release 1.4 adds an 'order' element as a possible child of the 'list' element, in order to specify the default order of lists. Otherwise unchanged from 1.3. diff --git a/project.clj b/project.clj index 85df47a..4e49efb 100644 --- a/project.clj +++ b/project.clj @@ -24,9 +24,8 @@ ;; [uncomplexor "0.1.0-SNAPSHOT"] ] - ;; `lein release` doesn't work with `git flow release`. To use - ;; `lein release`, first merge `develop` into `master`, and then, in branch - ;; `master`, run `lein release` + ;; `lein release` doesn't play nice with `git flow release`. Run `lein release` in the + ;; `develop` branch, then reset the `master` branch to the release tag. :deploy-repositories [["releases" :clojars] ["snapshots" :clojars]]