summaryrefslogtreecommitdiff
path: root/soledad_server
diff options
context:
space:
mode:
authorTomás Touceda <chiiph@leap.se>2014-05-29 10:42:49 -0300
committerTomás Touceda <chiiph@leap.se>2014-05-29 10:42:49 -0300
commit16851aa62858fb1eac1b725f5415a334a093fa51 (patch)
treedf6a0a40d29c0ba14f5f4cf532137d552ed4f2df /soledad_server
parent5cb40a959af827e4eadde1c047664c4f4c0ae01d (diff)
parent951ba59425a40d29cf6aea1d5ea56c92ef2404c1 (diff)
Merge remote-tracking branch 'refs/remotes/drebs/feature/5517_split-sync-post' into develop
Diffstat (limited to 'soledad_server')
0 files changed, 0 insertions, 0 deletions