diff options
| author | Silvio Rhatto <rhatto@riseup.net> | 2013-07-29 11:42:02 -0300 |
|---|---|---|
| committer | Silvio Rhatto <rhatto@riseup.net> | 2013-07-29 11:42:02 -0300 |
| commit | bb3c9a26bb75c76c5934d327548bf08606467b9f (patch) | |
| tree | 26760aa866799fc70683ef6845bf54fb17bdc955 /version.php | |
| parent | 2feedf39f6484879333a7b77fdc3c184150db8c7 (diff) | |
| parent | 398572fd96c72b363fd5a252fb9cbe1cecab1e04 (diff) | |
| download | elgg-bb3c9a26bb75c76c5934d327548bf08606467b9f.tar.gz elgg-bb3c9a26bb75c76c5934d327548bf08606467b9f.tar.bz2 | |
Merge branch 'floxglove-3' into saravea
Conflicts:
.gitmodules
Diffstat (limited to 'version.php')
| -rw-r--r-- | version.php | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/version.php b/version.php index 07a08ab4a..b5822b371 100644 --- a/version.php +++ b/version.php @@ -5,13 +5,13 @@ * This is compared against the values stored in the database to determine * whether upgrades should be performed. * - * @package Elgg + * @package Elgg * @subpackage Core */ // YYYYMMDD = Elgg Date // XX = Interim incrementer -$version = 2013012900; +$version = 2013030600; // Human-friendly version name -$release = '1.8.13'; +$release = '1.8.14'; |