Merge branch 'master', remote-tracking branch 'remotes/upstream/master'

* remotes/upstream/master:
  diabook-themes: small fix
  changelog 1.014 : image-rezise via jquery-plugin in stream comments under uploaded pictues add Diabook's version-number in head-section
  ignore utf8 offset error for unit tests
  had arg order backwards
  try assertContains
  tag tests cont.
  fix autonamenegativelength test
  some work on tests

* master:

1 files changed, 1 insertions, 1 deletions

diff --git a/boot.php b/boot.php
index 1bc4c2a9a..576cad6b6 100644
--- a/boot.php
+++ b/boot.php
@@ -9,7 +9,7 @@ require_once('include/nav.php');
 require_once('include/cache.php');
 
 define ( 'FRIENDICA_PLATFORM',     'Friendica');
-define ( 'FRIENDICA_VERSION',      '2.3.1303' );
+define ( 'FRIENDICA_VERSION',      '2.3.1304' );
 define ( 'DFRN_PROTOCOL_VERSION',  '2.23'    );
 define ( 'DB_UPDATE_VERSION',      1137      );