summaryrefslogtreecommitdiff
path: root/data/ts
diff options
context:
space:
mode:
authorTomás Touceda <chiiph@leap.se>2013-08-28 15:54:55 -0300
committerTomás Touceda <chiiph@leap.se>2013-08-28 15:54:55 -0300
commit37363c9700c245623d9c7f50ccbdfe1b9482eafe (patch)
treed877444d9eb9fdb3c61a1c05cc4383a04b997216 /data/ts
parent8a94537a66275950d6b9fb986ca1ae3970fd9232 (diff)
parent3b12583c01976025a18caef8ef4bdccae9e92549 (diff)
Merge remote-tracking branch 'ivan/feature/3574_use-dirspec-instead-of-xdg' into develop
Conflicts: src/leap/bitmask/config/leapsettings.py
Diffstat (limited to 'data/ts')
0 files changed, 0 insertions, 0 deletions