DariusIII ecf47744f9 Merge remote-tracking branch 'origin/dev' into dev ...

Conflicts:
	newznab/build/newznab.xml
	newznab/libraries/Cache.php

2015-06-16 00:49:16 +02:00

..

reqscraper

Move files around.

2015-05-28 12:36:28 +02:00

sphinxsearch

Fisrt batch of changes from site to settings.

2015-05-28 15:59:55 +02:00

testing

Add APC caching method, update automated.config.php and settings.php.example accordingly. Add find_password_hash_cost.php into misc/testing/Various/ folder.

2015-06-15 09:06:52 +02:00

update_scripts

Merge remote-tracking branch 'origin/dev' into dev

2015-06-16 00:49:16 +02:00

urlrewriting

Move files around.

2015-05-28 12:36:28 +02:00