summaryrefslogtreecommitdiff
path: root/data/resources
diff options
context:
space:
mode:
authorTomás Touceda <chiiph@leap.se>2014-08-11 14:21:46 -0300
committerTomás Touceda <chiiph@leap.se>2014-08-11 14:21:46 -0300
commit0046468367bd7cb1f1dd043bda46d9b9e2f4e30a (patch)
treeb6c193e92ba69a9b43e72e8ebfc0f88b602170a7 /data/resources
parente841a4b55abda36c3a9a1ca7c4072d9ac37e3fa4 (diff)
parentff4f8e1b1b0cbe48e8d94fed5128acc60be9bf1a (diff)
Merge remote-tracking branch 'refs/remotes/meskio/bug/wait-for-eip-to-autologin' into develop
Diffstat (limited to 'data/resources')
0 files changed, 0 insertions, 0 deletions