From: Jakob Sack <kde@jakobsack.de>
Date: Sun, 17 Apr 2011 18:00:25 +0000 (+0200)
Subject: Merge branch 'refactoring' of git://anongit.kde.org/owncloud into refactoring
X-Git-Tag: v3.0~267^2~558^2~75
X-Git-Url: https://source.dussan.org/?a=commitdiff_plain;h=21def39dacd2c452d401c7658b91c86087b5e8e1;p=nextcloud-server.git

Merge branch 'refactoring' of git://anongit.kde.org/owncloud into refactoring
---

21def39dacd2c452d401c7658b91c86087b5e8e1
diff --cc help/index.php
index e6a2d5661f5,f77972f58a7..de461c29412
--- a/help/index.php
+++ b/help/index.php
@@@ -7,8 -7,14 +7,13 @@@ if( !OC_USER::isLoggedIn())
      exit();
  }
  
+ //hardcode for testing
+ $pagecount=8;
+ $page=2;
+ 
+ 
  // Load the files we need
  OC_UTIL::addStyle( "help", "help" );
 -
  OC_APP::setActiveNavigationEntry( "help" );
  
  $kbe=OC_OCSCLIENT::getKnownledgebaseEntries();