summaryrefslogtreecommitdiff
path: root/data/resources
diff options
context:
space:
mode:
authorTomás Touceda <chiiph@leap.se>2013-07-05 12:20:01 -0300
committerTomás Touceda <chiiph@leap.se>2013-07-05 12:20:01 -0300
commit124e1c2b7c9680ca675a5be223208f4bdfcd7720 (patch)
treeb1eb56bcd7c81c1a05367a1c5ef3802ca91c7cc2 /data/resources
parentb5516cc47b887d989690bde102441726927b84f1 (diff)
parente004f3e18a983338c7769ffbde3466843aa69858 (diff)
Merge remote-tracking branch 'drebs/feature/3037-separate-keymanager-into-its-own-package' into develop
Diffstat (limited to 'data/resources')
0 files changed, 0 insertions, 0 deletions