summaryrefslogtreecommitdiff
path: root/data/ts
diff options
context:
space:
mode:
authorTomás Touceda <chiiph@leap.se>2014-08-11 20:08:10 -0300
committerTomás Touceda <chiiph@leap.se>2014-08-11 20:08:10 -0300
commitad2d4b132805270a13a6c80d6e6f154d687315b3 (patch)
treee2fe502e35c7a0a45726972385ee78114e50238f /data/ts
parentc52ca1aa1e9637d3e7d18f30b7c476ab1b1fe13a (diff)
parent4e3de46b0398f363c65a74197ebd858f6d577b81 (diff)
Merge remote-tracking branch 'refs/remotes/elijah/feature/iconcleanup' into develop
Diffstat (limited to 'data/ts')
0 files changed, 0 insertions, 0 deletions