summaryrefslogtreecommitdiff
path: root/Makefile
diff options
context:
space:
mode:
authorTomás Touceda <chiiph@leap.se>2014-02-12 10:59:36 -0300
committerTomás Touceda <chiiph@leap.se>2014-02-12 10:59:36 -0300
commit75e564c7a98243d3b2ba6bea2478abe69a875855 (patch)
treeed7615e3819ac1f859cff78d88d8d68993a86f87 /Makefile
parent73047830a243217406d72b267d106c5c8434b499 (diff)
parent29902330067f564185d7b57a864be2099f8ea2e8 (diff)
Merge remote-tracking branch 'refs/remotes/ivan/bug/cancel-login-does-not-work' into develop
Diffstat (limited to 'Makefile')
0 files changed, 0 insertions, 0 deletions