From 23617b21bc9dd2b5431e297133f7e80c95f43bbd Mon Sep 17 00:00:00 2001
From: "Marcel Kapfer (mmk2410)" <marcelmichaelkapfer@yahoo.co.nz>
Date: Sat, 7 May 2016 17:41:31 +0200
Subject: [PATCH] Version bump to 1.4.0

---
 CHANGELOG.md | 17 ++++++++++++++++-
 LICENSE      |  2 +-
 package.json |  2 +-
 3 files changed, 18 insertions(+), 3 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 579b773..b914f39 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -6,7 +6,22 @@
 
  - [S] release are always compared to the previous [S] release.
 
-## Version 1.4.0-beta [B]
+## Version 1.4.0 (2016-05-07) [S]
+
+ - Fix: Feeds contain no text
+ - Switch to YAML as config language
+ - Scripts for
+  - Switching from config.php to config.yaml
+  - Initializing RCC
+  - Initializing Rangitaki
+ - Rangitaki API
+ - Switch from JavaScript to CoffeeScript
+ - Switch from CSS to SASS
+ - Building and minimizing with Gulp
+ - Open links in articles in a new tab
+ - Better code style: PSR-2
+
+## Version 1.4.0-beta (2016-04-27) [B]
 
  - Fix: Feeds contain no text
  - Switch to YAML as config language
diff --git a/LICENSE b/LICENSE
index 48a1619..218f258 100644
--- a/LICENSE
+++ b/LICENSE
@@ -1,6 +1,6 @@
 The MIT License (MIT)
 
-Copyright (c) 2015 Marcel Kapfer
+Copyright (c) 2015 - 2016 Marcel Kapfer
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal
diff --git a/package.json b/package.json
index ad5ce2f..e0379b9 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "rangitaki",
-  "version": "1.4.0-beta",
+  "version": "1.4.0",
   "description": "A simple PHP blogging engine without any database dependencies",
   "main": "index.php",
   "scripts": {