diff options
| author | Ralph Amissah <ralph@amissah.com> | 2015-04-25 13:50:40 -0400 |
|---|---|---|
| committer | Ralph Amissah <ralph@amissah.com> | 2015-04-25 13:50:40 -0400 |
| commit | aeb7754510ffacc207b17e5d7512ff5f14debcc3 (patch) | |
| tree | e2f17e3ad2ee4e1ea81287febe5049ce6fb82147 /CHANGELOG | |
| parent | added patch jessie_bugfix_767761 (diff) | |
| parent | version & changelog, tag for release (diff) | |
Merge tag 'sisu_5.8.0' into debian/sid
SiSU 5.8.0
Conflicts:
.gitignore
data/doc/sisu/CHANGELOG_v5
data/doc/sisu/CHANGELOG_v6
data/sisu/v5/v/version.yml
data/sisu/v6/v/version.yml
setup/sisu_version.rb
Diffstat (limited to 'CHANGELOG')
| -rw-r--r-- | CHANGELOG | 2 |
1 files changed, 1 insertions, 1 deletions
@@ -10,7 +10,7 @@ * ./debian/changelog (in debian/sid branch) * README -* sisu.org +* ./data/doc/sisu/org/sisu.org * sisu-markup-samples source: <http://git.sisudoc.org/gitweb/?p=doc/sisu-markup-samples.git;a=summary> |