diff options
| author | mschaefers <mschaefers@scoop-gmbh.de> | 2012-12-03 09:49:23 +0100 |
|---|---|---|
| committer | mschaefers <mschaefers@scoop-gmbh.de> | 2012-12-03 09:49:23 +0100 |
| commit | ba6ae959b8e21c714c69f66254e82837d45a3ed2 (patch) | |
| tree | 3f538ad138d47b43d8f6a00e0f3c18c147bfcb90 /src/com/gitblit/GitblitUserService.java | |
| parent | e2013b91626a4c693053e9859add68ff371f2298 (diff) | |
| parent | f1c3a882d12aede461e3c8ca3ebd298bdb28bc5d (diff) | |
| download | gitblit-ba6ae959b8e21c714c69f66254e82837d45a3ed2.tar.gz gitblit-ba6ae959b8e21c714c69f66254e82837d45a3ed2.zip | |
Merge branch 'master' of https://github.com/gitblit/gitblit into enhancedLdap
Conflicts:
distrib/gitblit.properties
Diffstat (limited to 'src/com/gitblit/GitblitUserService.java')
0 files changed, 0 insertions, 0 deletions