summaryrefslogtreecommitdiff
path: root/changes/feature_reintegrate_soledad
diff options
context:
space:
mode:
authorTomás Touceda <chiiph@leap.se>2013-07-29 10:39:33 -0300
committerTomás Touceda <chiiph@leap.se>2013-07-29 10:39:33 -0300
commitb39584175fda25d812dbb90d3fa171f7a50e3914 (patch)
treed2534eb72fe414db0f740b2e136f318f77ea8b69 /changes/feature_reintegrate_soledad
parent0b02078c3b0de38103fb21294405422d4113177b (diff)
parentca954cf70544a249e100400d7648c553ccba8d5f (diff)
Merge remote-tracking branch 'ivan/feature/keep-danger-enabled' into develop
Diffstat (limited to 'changes/feature_reintegrate_soledad')
0 files changed, 0 insertions, 0 deletions