summaryrefslogtreecommitdiff
path: root/Makefile
diff options
context:
space:
mode:
authorKali Kaneko <kali@leap.se>2014-02-17 11:46:31 -0400
committerKali Kaneko <kali@leap.se>2014-02-17 11:46:31 -0400
commitb814e84107ae1d89e0c9d2392b6d3ef7fee4bb53 (patch)
treee490cd2c7b941634163e77a1e0815bff4d2f8e1a /Makefile
parent75e564c7a98243d3b2ba6bea2478abe69a875855 (diff)
parent7cfe280436db6ef1eb89281c23c71163df0ecdfa (diff)
Merge remote-tracking branch 'ivan-github/feature/preserve-uuid-on-logout' into develop
Diffstat (limited to 'Makefile')
0 files changed, 0 insertions, 0 deletions