Matthias Mees 1448313fb8 Merge branch '2.0' of github.com:s9y/Serendipity into 2.0
Conflicts:
	templates/2k11/admin/entries.tpl
	templates/2k11/admin/serendipity_editor.js.tpl
	templates/2k11/admin/style.css
2015-01-17 18:12:15 +01:00
..
2015-01-05 11:37:29 +01:00
2015-01-05 11:37:29 +01:00
2015-01-05 11:37:29 +01:00
2015-01-05 11:37:29 +01:00
2015-01-05 11:37:29 +01:00
2011-01-06 17:46:43 +00:00
2015-01-05 11:37:29 +01:00
2006-08-02 10:07:34 +00:00
2014-12-23 16:46:08 +01:00