diff options
author | kali <kali@leap.se> | 2013-06-11 01:15:00 +0900 |
---|---|---|
committer | kali <kali@leap.se> | 2013-06-11 01:15:00 +0900 |
commit | 0823d50a902609517ca4b79528b95903f22125b0 (patch) | |
tree | 9c35b8a4c7c8a0278be1319048ac1b4507c7c3c9 /.tx/config | |
parent | 3d91da9b320d2dd267b0c1799c25a3e140077666 (diff) | |
parent | 40c1190ad556aee33d1b90a9c234b36ad0759861 (diff) |
Merge remote-tracking branch 'chiiph/feature/granular_login' into develop
Diffstat (limited to '.tx/config')
0 files changed, 0 insertions, 0 deletions