Merge branch '0.6.x'

Conflicts: index.html

Merge branch '0.6.x'
Conflicts: index.html
e85eb667 · JC Brand · b13ae5af · 32593b75 · e85eb667
Commit e85eb667 authored Oct 03, 2013 by JC Brand
Hide whitespace changes
Inline Side-by-side

Showing with 4 additions and 3 deletions

CHANGES.rst CHANGES.rst +4 -3

No files found.
--- a/CHANGES.rst
+++ b/CHANGES.rst
@@ -4,9 +4,10 @@ Changelog
 0.6.5 (Unreleased)
 ------------------
-* Fetch vCards asynchronously once a roster contacts is added. [jcbrand]
+* Fetch vCards asynchronously once a roster contacts is added [jcbrand]
-* Hungarian translation. [w3host]
+* Hungarian translation [w3host]
-* Update CSS to avoid clash with bootstrap. [seocam]
+* Russian translation [bkocherov]
+* Update CSS to avoid clash with bootstrap [seocam]
 0.6.4 (2013-09-15)
 ------------------