pierre/wallabag
1
0
Fork 0
forked from wallabag/wallabag
Code Issues Pull Requests Packages Projects Releases 1 Wiki Activity

Merge remote branch 'upstream/dev' into dev

Browse Source 
Conflicts:
	themes/default/_head.twig
This commit is contained in:
Jean-Christophe Saad-Dupuy
2013-10-07 14:25:24 +02:00
parent 2916d24b20 894c36ea32
commit 5e07dc8b51
10 changed files with 65 additions and 204 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
inc/poche/config.inc.php.new
View File

@ -52,8 +52,6 @@ define ('CACHE', ROOT . '/cache');
define ('PAGINATION', '10');
define ('POCHE_VERSION', '1.0.0');
define ('POCKET_FILE', '/ril_export.html');
define ('READABILITY_FILE', '/readability');
define ('INSTAPAPER_FILE', '/instapaper-export.html');