diff options
author | ArthurHoaro <arthur@hoa.ro> | 2017-01-20 17:04:51 +0100 |
---|---|---|
committer | GitHub <noreply@github.com> | 2017-01-20 17:04:51 +0100 |
commit | 6f566b69ba141c29fb3fa1e32a1760a1e8b09840 (patch) | |
tree | 528f2dbbda38343e1deedd28d405762a57af07f9 | |
parent | 89dcbe52775bac8d544448ff4f80b6256875de91 (diff) | |
parent | 03cadbe2208f865af3da8986cb9820cbb5e1fb24 (diff) | |
download | Shaarli-6f566b69ba141c29fb3fa1e32a1760a1e8b09840.tar.gz Shaarli-6f566b69ba141c29fb3fa1e32a1760a1e8b09840.tar.zst Shaarli-6f566b69ba141c29fb3fa1e32a1760a1e8b09840.zip |
Merge pull request #771 from ArthurHoaro/master
v0.8.3 version bump in master
-rw-r--r-- | CHANGELOG.md | 6 | ||||
-rw-r--r-- | index.php | 2 | ||||
-rw-r--r-- | shaarli_version.php | 2 |
3 files changed, 8 insertions, 2 deletions
diff --git a/CHANGELOG.md b/CHANGELOG.md index 04aacad6..7e98a5ad 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md | |||
@@ -52,6 +52,12 @@ configuration to enable URL rewriting, see: | |||
52 | - Fix permalink image alignment in daily page | 52 | - Fix permalink image alignment in daily page |
53 | - Fix the delete button in `editlink` | 53 | - Fix the delete button in `editlink` |
54 | 54 | ||
55 | ## [v0.8.3](https://github.com/shaarli/Shaarli/releases/tag/v0.8.3) - 2017-01-20 | ||
56 | |||
57 | ### Fixed | ||
58 | |||
59 | - PHP 7.1 compatibility: add ConfigManager parameter to anti-bruteforce function call in login template. | ||
60 | |||
55 | ## [v0.8.2](https://github.com/shaarli/Shaarli/releases/tag/v0.8.2) - 2016-12-15 | 61 | ## [v0.8.2](https://github.com/shaarli/Shaarli/releases/tag/v0.8.2) - 2016-12-15 |
56 | 62 | ||
57 | ### Fixed | 63 | ### Fixed |
@@ -1,6 +1,6 @@ | |||
1 | <?php | 1 | <?php |
2 | /** | 2 | /** |
3 | * Shaarli v0.8.2 - Shaare your links... | 3 | * Shaarli v0.8.3 - Shaare your links... |
4 | * | 4 | * |
5 | * The personal, minimalist, super-fast, database free, bookmarking service. | 5 | * The personal, minimalist, super-fast, database free, bookmarking service. |
6 | * | 6 | * |
diff --git a/shaarli_version.php b/shaarli_version.php index e93b0e7f..3f79a4c6 100644 --- a/shaarli_version.php +++ b/shaarli_version.php | |||
@@ -1 +1 @@ | |||
<?php /* 0.8.2 */ ?> | <?php /* 0.8.3 */ ?> | ||