diff options
| author | Kali Kaneko <kali@leap.se> | 2013-12-23 01:56:30 -0400 |
|---|---|---|
| committer | Kali Kaneko <kali@leap.se> | 2013-12-23 01:56:30 -0400 |
| commit | 207b77f926a294132e45439df693bd473253a146 (patch) | |
| tree | cc07488964795e374271dcb9fa2e68c98855b3d1 /debian/changelog | |
| parent | 8d23b2971f27d6d549004c2d748494f367eab460 (diff) | |
| parent | 19af1736a750a1a8679c21071305b97f626f1d14 (diff) | |
Merge branch 'develop' into debian
Preparing for 0.5.0~rc
Conflicts:
.gitignore
client/src/leap/soledad/client/_version.py
common/src/leap/soledad/common/_version.py
server/src/leap/soledad/server/_version.py
Diffstat (limited to 'debian/changelog')
0 files changed, 0 insertions, 0 deletions