From bde8a330dc0a0cd43df1679a3f2c1d08b9bcfdf3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tom=C3=A1s=20Touceda?= Date: Fri, 18 Jul 2014 10:57:43 -0300 Subject: Fold in changes --- CHANGELOG | 4 ++++ changes/bug_5897-include-pemfiles | 1 - changes/feature_support_cacert_osx | 1 - 3 files changed, 4 insertions(+), 2 deletions(-) delete mode 100644 changes/bug_5897-include-pemfiles delete mode 100644 changes/feature_support_cacert_osx diff --git a/CHANGELOG b/CHANGELOG index e76720c..8895de3 100644 --- a/CHANGELOG +++ b/CHANGELOG @@ -1,3 +1,7 @@ +0.3.9 Jul 18, 2014: + o Include pemfile in the package data. Closes #5897. + o Look for bundled cacert.pem in the Resources dir for OSX. + 0.3.8 Jun 6, 2014: o Add Soledad sync status signals. Closes #5517. diff --git a/changes/bug_5897-include-pemfiles b/changes/bug_5897-include-pemfiles deleted file mode 100644 index b25345b..0000000 --- a/changes/bug_5897-include-pemfiles +++ /dev/null @@ -1 +0,0 @@ -o Include pemfile in the package data. Closes: #5897 diff --git a/changes/feature_support_cacert_osx b/changes/feature_support_cacert_osx deleted file mode 100644 index 90a51bf..0000000 --- a/changes/feature_support_cacert_osx +++ /dev/null @@ -1 +0,0 @@ - o Look for bundled cacert.pem in the Resources dir for OSX. \ No newline at end of file -- cgit v1.2.3