summaryrefslogtreecommitdiff
path: root/README.markdown
diff options
context:
space:
mode:
authorSimon Holywell <[email protected]>2015-01-19 13:04:08 +0000
committerSimon Holywell <[email protected]>2015-01-19 13:04:08 +0000
commit391eb8aa27b107a79286e3c21f5f30580f20ae5e (patch)
treed2422c1e79f2d183700ad599d0f928597ac00d34 /README.markdown
parent41b51d6fd211cfa155d3d43c39d904d5aa106710 (diff)
Add merges to the changelog
Diffstat (limited to 'README.markdown')
-rw-r--r--README.markdown9
1 files changed, 4 insertions, 5 deletions
diff --git a/README.markdown b/README.markdown
index 6a789cc..c4da420 100644
--- a/README.markdown
+++ b/README.markdown
@@ -75,12 +75,11 @@ foreach ($tweets as $tweet) {
Changelog
---------
-#### 1.5.3 - released 2014-10-01
-
-* Add @method tags for magic methods [[stellis](https://github.com/stellis)]
-
-#### 1.5.2 - released 2014-06-27
+#### 1.5.2 - released 2014-XX-XX
+* Add @method tags for magic methods [[stellis](https://github.com/stellis)] - [issue #237](https://github.com/j4mie/idiorm/issues/237)
+* Adding Code Climate badge to the readme file [[e3betht](https://github.com/e3betht)] - [issue #260](https://github.com/j4mie/idiorm/issues/260)
+* Typo in navigation [[leongersen](https://github.com/leongersen)] - [issue #257](https://github.com/j4mie/idiorm/issues/257)
* Support named placeholders logging and test [[m92o](https://github.com/m92o)] - [issue #223](https://github.com/j4mie/idiorm/issues/223)
* `having_id_is()` reference undefined variable `$value` [[Treffynnon](https://github.com/treffynnon)] - [issue #224](https://github.com/j4mie/idiorm/issues/224)