summaryrefslogtreecommitdiff
path: root/data/resources
diff options
context:
space:
mode:
authorTomás Touceda <chiiph@leap.se>2013-08-01 18:09:37 -0300
committerTomás Touceda <chiiph@leap.se>2013-08-01 18:09:37 -0300
commit08a6f880b64b46db5d4efdcfc48c2cddec589f67 (patch)
tree46e0b34b8075194254a92a9c7109575f4c5df935 /data/resources
parent1b9f4c824406f26e135a0d96cad04064b8864615 (diff)
parent599f6bf0d4f819ab1613bf9449c122025da07c13 (diff)
Merge remote-tracking branch 'ivan/feature/3318_add-cancel-button-to-login' into develop
Diffstat (limited to 'data/resources')
0 files changed, 0 insertions, 0 deletions