Merge branch 'dev' into releases

1 files changed, 0 insertions, 23 deletions

diff --git a/public/data/Configuration.array.php b/public/data/Configuration.array.php
deleted file mode 100644
index ce5a1a8ee..000000000
--- a/public/data/Configuration.array.php
+++ /dev/null
@@ -1,23 +0,0 @@
-<?php
-return array (
-	'posts_per_page' => 20,
-	'default_view' => 'not_read',
-	'display_posts' => 'no',
-	'sort_order' => 'low_to_high',
-	'old_entries' => 3,
-	'mail_login' => '',
-	'shortcuts' => array (
-		'mark_read' => 'r',
-		'mark_favorite' => 'f',
-		'go_website' => 'space',
-		'next_entry' => 'j',
-		'prev_entry' => 'k',
-		'next_page' => 'right',
-		'prev_page' => 'left',
-	),
-	'mark_when' => array (
-		'article' => 'yes',
-		'site' => 'yes',
-		'page' => 'no',
-	),
-);