summaryrefslogtreecommitdiff
path: root/LICENSE
diff options
context:
space:
mode:
authorTomás Touceda <chiiph@leap.se>2013-12-13 09:34:39 -0300
committerTomás Touceda <chiiph@leap.se>2013-12-13 09:34:39 -0300
commitb1ebbc2b5ca9c5d0591c10c876b871e9cfb2e367 (patch)
treed53f1f01b8e35bff3367258afae085765e53ef31 /LICENSE
parent8969c7396c61be96040206ff18a29ec56e20825e (diff)
parent2a8632e60a538828e8c5b417c5b02fbdaaccc88d (diff)
Merge remote-tracking branch 'refs/remotes/elijah/feature/login-on-top' into develop
Diffstat (limited to 'LICENSE')
0 files changed, 0 insertions, 0 deletions