Skip to content

Commit

Permalink
Merge remote-tracking branch 'origin/develop'
Browse files Browse the repository at this point in the history
  • Loading branch information
TheoLechemia committed Jun 7, 2018
2 parents 6954045 + 65a754a commit 2511c88
Show file tree
Hide file tree
Showing 2 changed files with 6 additions and 2 deletions.
2 changes: 1 addition & 1 deletion VERSION
Original file line number Diff line number Diff line change
@@ -1 +1 @@
1.1.1dev0
1.1.1
6 changes: 5 additions & 1 deletion docs/changelog.rst
Original file line number Diff line number Diff line change
@@ -1,9 +1,13 @@
CHANGELOG
*********

1.1.1 (unreleased)
1.1.2 (unreleased)
------------------

1.1.1 (2018-06-18)
------------------

* Version corrective lié à la récupération du CRUVED des sous-modules

1.1.0 (2018-05-17)
------------------
Expand Down

0 comments on commit 2511c88

Please sign in to comment.