Commit graph

5 commits

Author SHA1 Message Date
Ian d35c48d750 due to merge conflict change, added htaccess fix to last commit 2013-05-22 09:35:02 +02:00
Ian 41f5f8f2a5 Merge branch 'master' of github.com:s9y/additional_plugins
Conflicts:
	serendipity_event_fckeditor/.htaccess
2013-05-22 09:32:18 +02:00
Ian 8cfe3b2713 fckeditor update 2013-05-22 09:28:46 +02:00
Garvin Hicking 37b106b1a6 testrun for tomorrow, try to actually allow .htaccess on mirror http servers 2013-05-21 08:48:11 +02:00
Garvin Hicking 516df79a4e Migrate plugins 2011-12-13 12:29:05 +01:00