Merge branch '2015.11-develop'
authorPhilipp Schüle <p.schuele@metaways.de>
Thu, 11 Feb 2016 09:41:52 +0000 (10:41 +0100)
committerPhilipp Schüle <p.schuele@metaways.de>
Thu, 11 Feb 2016 09:41:52 +0000 (10:41 +0100)
Conflicts:
tine20/Tinebase/js/tineInit.js

Change-Id: I568596034536cb7364da4dddad79d7924d177dcb

1  2 
tine20/Setup/Controller.php
tine20/Tinebase/js/tineInit.js

Simple merge
@@@ -52,8 -52,9 +52,9 @@@ Tine.clientVersion.releaseTime      = '
   * @type String
   */
  Tine.title = 'Tine 2.0';
--Tine.weburl = 'https://www.tine20.org/en/the-project/contribute.html';
- Tine.helpUrl = 'http://wiki.tine20.org/Main_Page';
 -Tine.helpUrl = 'http://www.tine20.org/wiki/index.php/Main_Page';
++Tine.weburl = 'http://www.tine20.com/1/welcome-community/';
++Tine.helpUrl = 'https://wiki.tine20.org/Main_Page';
+ Tine.bugreportUrl = 'https://api.tine20.net/bugreport.php';
  
  /**
   * quiet logging in release mode