From 460d40f775ced241c2d5d23d726e48c918ce65ac Mon Sep 17 00:00:00 2001
From: Tobias Zeising <tobias.zeising@aditu.de>
Date: Sat, 2 Feb 2013 20:37:27 +0100
Subject: [PATCH] update version number

---
 README.md |  3 +--
 index.php | 12 +++++-------
 2 files changed, 6 insertions(+), 9 deletions(-)

diff --git a/README.md b/README.md
index c7fc714dfa..ad6906cf57 100644
--- a/README.md
+++ b/README.md
@@ -4,7 +4,7 @@ selfoss
 Copyright (c) 2013 Tobias Zeising, tobias.zeising@aditu.de  
 http://selfoss.aditu.de  
 Licensed under the GPLv3 license  
-Version 2.0 beta
+Version 2.0
 
 
 INSTALLATION
@@ -81,5 +81,4 @@ Special thanks to the great programmers of this libraries which will be used in
 * Spectrum Colorpicker: https://github.com/bgrins/spectrum
 * jQuery custom content scroller: http://manos.malihu.gr/jquery-custom-content-scroller/
 
-
 Icon Source: http://blog.artcore-illustrations.de/aicons/
\ No newline at end of file
diff --git a/index.php b/index.php
index 35047bb54a..cec10ac2f6 100644
--- a/index.php
+++ b/index.php
@@ -1,11 +1,9 @@
 <?php
 
-//require __DIR__.'/libs/f3/base.php';
-
 $f3 = require(__DIR__.'/libs/f3/base.php');
 
 $f3->set('DEBUG',0);
-$f3->set('version','2.0b');
+$f3->set('version','2.0');
 $f3->set('AUTOLOAD',__dir__.'/;libs/f3/;libs/;libs/WideImage/;daos/;libs/twitteroauth/;libs/FeedWriter/');
 $f3->set('cache',__dir__.'/data/cache');
 $f3->set('BASEDIR',__dir__);
@@ -53,14 +51,14 @@
 $f3->route('GET /password',  'controllers\Index->password');
 $f3->route('POST /password', 'controllers\Index->password');
 $f3->route('GET /update',    'controllers\Items->update');
-$f3->route('GET /tags',    	'controllers\Tags->tags');
+$f3->route('GET /tags',        'controllers\Tags->tags');
 
 $f3->route('GET /api/login',  'controllers\Api->login');
 $f3->route('GET /api/logout', 'controllers\Api->logout');
     
 if($f3->get('auth')->isLoggedin()===true) {
     $f3->route('POST /mark/@item',    'controllers\Items->mark');
-    $f3->route('POST /mark',    	  'controllers\Items->mark');
+    $f3->route('POST /mark',          'controllers\Items->mark');
     $f3->route('POST /unmark/@item',  'controllers\Items->unmark');
     $f3->route('POST /starr/@item',   'controllers\Items->starr');
     $f3->route('POST /unstarr/@item', 'controllers\Items->unstarr');
@@ -70,8 +68,8 @@
     $f3->route('POST /source/@id',    'controllers\Sources->write');
     $f3->route('POST /source',        'controllers\Sources->write');
     $f3->route('DELETE /source/@id',  'controllers\Sources->remove');
-    $f3->route('POST /tagset',    	  'controllers\Tags->tagset');
-	
+    $f3->route('POST /tagset',          'controllers\Tags->tagset');
+    
     $f3->route('POST /api/items',        'controllers\Api->items');
     $f3->route('GET /api/items',         'controllers\Api->items');
     $f3->route('GET /api/mark/@item',    'controllers\Api->mark');