mbirth/LuckyCoinkydink
1
0
Fork 0
Code Issues Pull Requests Activity

Merge branch 'master' of github.com:s9y/Serendipity

Browse Source 
Conflicts:
	README.markdown
This commit is contained in:
Garvin Hicking 2011-10-24 18:29:54 +02:00
commit e67380e24d
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
README.markdown
View File

@ -1,3 +1,3 @@
# Serendipity Weblog System # Serendipity - a PHP Weblog/Blog software
(Master branch) [Serendipity](http://s9y.org) is a PHP-powered weblog application which gives the user an easy way to maintain an online diary, weblog or even a complete homepage. While the default package is designed for the casual blogger, Serendipity offers a flexible, expandable and easy-to-use framework with the power for professional applications.