Merge pull request #2061 from rabuzarus/0711_forumlist

move forumlist addon to core

diff --cc boot.php
index 0c6683b0a1b517273475a8d0c014deb8076decd0,6e9e45873a45cb6ca5f8e5b14d08e1cf35c73ea5..d4c5ec093a0477656ab2ceb4d449f4f9cd4ef6e9
--- 1/boot.php
--- 2/boot.php
+++ b/boot.php
@@@ -17,9 -17,9 +17,9 @@@ require_once('include/dbstructure.php')
  
  define ( 'FRIENDICA_PLATFORM',     'Friendica');
  define ( 'FRIENDICA_CODENAME',     'Lily of the valley');
 -define ( 'FRIENDICA_VERSION',      '3.4.2' );
 +define ( 'FRIENDICA_VERSION',      '3.4.3-dev' );
  define ( 'DFRN_PROTOCOL_VERSION',  '2.23'    );
- define ( 'DB_UPDATE_VERSION',      1190      );
+ define ( 'DB_UPDATE_VERSION',      1191      );
  define ( 'EOL',                    "<br />\r\n"     );
  define ( 'ATOM_TIME',              'Y-m-d\TH:i:s\Z' );
  

diff --cc view/theme/vier/theme.php
Simple merge