summaryrefslogtreecommitdiff
path: root/data
diff options
context:
space:
mode:
authorTomás Touceda <chiiph@leap.se>2014-01-07 17:44:00 -0300
committerTomás Touceda <chiiph@leap.se>2014-01-07 17:44:00 -0300
commitdf0d02a565631693f62e99abb2b4be8b8bd450f5 (patch)
tree245c5d541e69346418fb96cb722c5ddb8299aa39 /data
parentd16e76cfdeb18b14cd97c9e8c7096b02aafe4da8 (diff)
parent257b42bf0baf923c1437778cd99d0a9cbf69637d (diff)
Merge remote-tracking branch 'refs/remotes/drebs/feature/4885_make-soledad-wait-for-eip-after-logging-in' into develop
Diffstat (limited to 'data')
0 files changed, 0 insertions, 0 deletions