diff options
author | Simon McVittie <simon.mcvittie@collabora.co.uk> | 2014-01-29 12:58:38 +0000 |
---|---|---|
committer | Simon McVittie <simon.mcvittie@collabora.co.uk> | 2014-01-29 12:58:38 +0000 |
commit | 64e9a2cfc53c6786e0a1005f244fa7a8e635d8c7 (patch) | |
tree | 8c5b81fa18541855ae88115ab46a029df26d430f | |
parent | 640e19a07a39756a8c3b5b68595589679403cc43 (diff) | |
parent | bba70fce033c7b5fcc120fcfce715ec79ca1361a (diff) | |
download | telepathy-glib-64e9a2cfc53c6786e0a1005f244fa7a8e635d8c7.tar.gz |
Merge branch 'telepathy-glib-0.22'
Conflicts:
NEWS
configure.ac
-rw-r--r-- | NEWS | 1 |
1 files changed, 0 insertions, 1 deletions
@@ -70,7 +70,6 @@ Fixes: • channel-group: don't crash if no message has been provided (Guillaume) - telepathy-glib 0.22.0 (2013-10-02) ================================== |