From feb4f4ee6b252f5b3e8713df03b829747a75834c Mon Sep 17 00:00:00 2001
From: Mattias Erming <mattias@mattiaserming.com>
Date: Fri, 12 Dec 2014 01:01:46 +0100
Subject: [PATCH] Release 0.48.0

---
 CHANGELOG.md | 44 ++++++++++++++++++++++++++------------------
 package.json |  2 +-
 2 files changed, 27 insertions(+), 19 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index a8ad5326..a2c11096 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,29 +1,37 @@
+0.48.0 / 2014-12-12
+===================
+
+  * Fetch max 1 link per message
+  * Fix '/me' message color
+  * Periodically hide older messages for inactive channels
+  * Only confirm exit in public mode
+  * Added '/ns' NickServ and '/cs' ChanServ shortcuts
 
 0.47.0 / 2014-11-19
-==================
+===================
 
   * Shout now supports fullscreen on iOS
 
 0.46.0 / 2014-11-14
-==================
+===================
 
   * Fix commands being removed from user.json
   * Added dynamic title
   * Turn off input autocomplete
 
 0.45.5 / 2014-11-05
-==================
+===================
 
   * Minor bugfixes
 
 0.45.4 / 2014-11-05
-==================
+===================
 
   * Added username input
   * Added 'morning' theme by @rikukissa
 
 0.45.3 / 2014-10-27
-==================
+===================
 
   * Remove password argument from add command
   * Support MIRC style terminators
@@ -32,13 +40,13 @@
   * Send NOTICE messages to the correct channel
 
 0.45.2 / 2014-10-16
-==================
+===================
 
   * Fix crash on failed TLS connect
   * Hide mode from badge count
 
 0.45.0 / 2014-10-14
-==================
+===================
 
   * Added identd daemon
   * Remember user networks and channels on restart
@@ -49,7 +57,7 @@
   * Change 'logs/' location
 
 0.44.0 / 2014-10-11
-==================
+===================
 
   * Added text color
   * Added 'prefetch' option
@@ -57,13 +65,13 @@
   * Always show right toggle
 
 0.43.1 / 2014-10-09
-==================
+===================
 
   * Disable login button on authentication
   * Fix 'shout edit' command 
 
 0.43.0 / 2014-10-08
-==================
+===================
 
   * Smarter nick completion
   * Prevent multiple logins
@@ -71,45 +79,45 @@
   * Allow relative '--home' path
 
 0.42.0 / 2014-10-04
-==================
+===================
 
   * Split users by mode in the sidebar
   * Show user mode in channel
 
 0.41.1 / 2014-10-03
-==================
+===================
 
   * Now installs properly on Windows
 
 0.41.0 / 2014-10-03
-==================
+===================
 
   * Use 'bcrypt-nodejs' package
   * No need to compile with node-gyp during install
 
 0.40.3 / 2014-10-02
-==================
+===================
 
   * Fix issue where actions from other users do not display
 
 0.40.2 / 2014-10-01
-==================
+===================
 
   * Fix existsSync
 
 0.40.1 / 2014-10-01
-==================
+===================
 
   * Fix config overwrite
 
 0.40.0 / 2014-10-01
-==================
+===================
 
   * Prevent private mode when no user exists
   * Move config to ~/.shout/
 
 0.39.1 / 2014-09-30
-==================
+===================
 
   * Scrolling now works correctly when loading thumbnails
   * List users on server start
diff --git a/package.json b/package.json
index 1ce6704d..e9275208 100644
--- a/package.json
+++ b/package.json
@@ -1,7 +1,7 @@
 {
   "name": "shout",
   "description": "The self-hosted web IRC client",
-  "version": "0.47.0",
+  "version": "0.48.0",
   "author": "Mattias Erming",
   "preferGlobal": true,
   "bin": {