diff options
author | Johannes Ranke <jranke@uni-bremen.de> | 2021-02-13 12:27:39 +0100 |
---|---|---|
committer | Johannes Ranke <jranke@uni-bremen.de> | 2021-02-13 12:27:39 +0100 |
commit | d2d25c51ad95b4344287917574d4c0506bfaf75d (patch) | |
tree | e516dda0401a5a547be4f96e89b5d96ba95f934a /docs/articles | |
parent | 48c463680b51fa767b4cd7bd62865f192d0354ac (diff) | |
parent | b4582fc7d3f1d395bfd9d870137b705469d9eab2 (diff) |
Merge branch 'master' into saemix
Run make testcheck to regenerate logs with merge conflicts
Diffstat (limited to 'docs/articles')
-rw-r--r-- | docs/articles/index.html | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/docs/articles/index.html b/docs/articles/index.html index 66393487..52770090 100644 --- a/docs/articles/index.html +++ b/docs/articles/index.html @@ -71,7 +71,7 @@ </button> <span class="navbar-brand"> <a class="navbar-link" href="../index.html">mkin</a> - <span class="version label label-default" data-toggle="tooltip" data-placement="bottom" title="Released version">1.0.1</span> + <span class="version label label-default" data-toggle="tooltip" data-placement="bottom" title="Released version">1.0.2</span> </span> </div> |