summaryrefslogtreecommitdiff
path: root/data/resources
diff options
context:
space:
mode:
authorTomás Touceda <chiiph@leap.se>2014-04-30 15:10:47 -0300
committerTomás Touceda <chiiph@leap.se>2014-04-30 15:10:47 -0300
commita3d7f51327642faee4e261c9ba64084c789527dd (patch)
tree3168958571a82f01ee7df8388a2aebce43db8e90 /data/resources
parent2781cc604de74ad3d41c939fb807b5e689d435eb (diff)
parent1b5e1e5356c2dc4d7a56604801aaf5a0378c9bff (diff)
Merge remote-tracking branch 'refs/remotes/ivan/feature/refactor-retry-to-soledadbootstrapper' into develop
Diffstat (limited to 'data/resources')
0 files changed, 0 insertions, 0 deletions