fixing README conflict

darcs-hash:20081124050556-099f7-3f0df19cfc3ecbf128cfff6db6f364110eff61d9.gz
This commit is contained in:
millette 2008-11-24 00:05:56 -05:00
parent 3a9ef2c0ce
commit a7e44d7ae3

6
README
View File

@ -2,8 +2,8 @@
README README
------ ------
Laconica 0.6.2 Laconica 0.6.3
13 November 2008 23 November 2008
This is the README file for Laconica, the Open Source microblogging This is the README file for Laconica, the Open Source microblogging
platform. It includes installation instructions, descriptions of platform. It includes installation instructions, descriptions of
@ -72,7 +72,7 @@ New this version
================ ================
This is a minor feature and security improvement version from version This is a minor feature and security improvement version from version
0.6.1 (release 6 Oct 2008). Notable features of version 0.6.2 include: 0.6.2 (release 13 Nov 2008). Notable features of version 0.6.3 include:
- 'nudge' functionality to tell a user that they're missed. - 'nudge' functionality to tell a user that they're missed.
- Links to related RSS/Atom feeds on all pages. - Links to related RSS/Atom feeds on all pages.