From: Arthur <arthur@hoa.ro>
Date: Wed, 18 Nov 2015 12:39:46 +0000 (+0100)
Subject: Merge pull request #383 from ArthurHoaro/master
X-Git-Tag: v0.6.1~16
X-Git-Url: https://git.immae.eu/?a=commitdiff_plain;h=a5dd1772bd17090e502eb8d117cf4efeed524b1e;hp=44d60adc5e2fa547bc49620f7e647794f0cad631;p=github%2Fshaarli%2FShaarli.git

Merge pull request #383 from ArthurHoaro/master

Bump version to v0.6.0
---

diff --git a/index.php b/index.php
index b06dd50c..872acf09 100644
--- a/index.php
+++ b/index.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * Shaarli v0.5.4 - Shaare your links...
+ * Shaarli v0.6.0 - Shaare your links...
  *
  * The personal, minimalist, super-fast, no-database Delicious clone.
  *
@@ -115,7 +115,7 @@ $GLOBALS['config']['PUBSUBHUB_URL'] = '';
 /*
  * PHP configuration
  */
-define('shaarli_version', '0.5.4');
+define('shaarli_version', '0.6.0');
 
 // http://server.com/x/shaarli --> /shaarli/
 define('WEB_PATH', substr($_SERVER["REQUEST_URI"], 0, 1+strrpos($_SERVER["REQUEST_URI"], '/', 0)));
diff --git a/shaarli_version.php b/shaarli_version.php
index 17f5ffab..a5f0a095 100644
--- a/shaarli_version.php
+++ b/shaarli_version.php
@@ -1 +1 @@
-<?php /* 0.5.4 */ ?>
+<?php /* 0.6.0 */ ?>