summaryrefslogtreecommitdiff
path: root/common
diff options
context:
space:
mode:
authorIvan Alejandro <ivanalejandro0@gmail.com>2013-09-06 15:52:59 -0300
committerIvan Alejandro <ivanalejandro0@gmail.com>2013-09-06 15:52:59 -0300
commitdccd720c685ce5f7744a240b7d8c0ad2795390ba (patch)
tree70ffb63227d8b93224339267589a08297f3d58fb /common
parent256f129c50ee232dc35043dface166780e3c1553 (diff)
parent6a72835b3fa7267ffcf30ae0e5b5fa948e296390 (diff)
Merge branch 'release-0.3.2' into develop
Diffstat (limited to 'common')
-rw-r--r--common/changes/feature_3487-split-soledad-into-common-client-and-server1
-rw-r--r--common/changes/feature_improve_packaging1
2 files changed, 0 insertions, 2 deletions
diff --git a/common/changes/feature_3487-split-soledad-into-common-client-and-server b/common/changes/feature_3487-split-soledad-into-common-client-and-server
deleted file mode 100644
index 2eab6b56..00000000
--- a/common/changes/feature_3487-split-soledad-into-common-client-and-server
+++ /dev/null
@@ -1 +0,0 @@
- o Split soledad package into common, client and server. Closes #3487.
diff --git a/common/changes/feature_improve_packaging b/common/changes/feature_improve_packaging
deleted file mode 100644
index e6d3630a..00000000
--- a/common/changes/feature_improve_packaging
+++ /dev/null
@@ -1 +0,0 @@
- o Add versioneer, parse_requirements