diff options
| author | Florian Zschocke <f.zschocke+git@gmail.com> | 2022-11-06 13:46:36 +0100 |
|---|---|---|
| committer | Florian Zschocke <f.zschocke+git@gmail.com> | 2022-11-06 13:46:36 +0100 |
| commit | c931f40b15a00da1f82384b203dd96ba6a0dc56d (patch) | |
| tree | de678ff660cdb45d23dcf8a72eb23a5adf17a98a /src/main/java/com/gitblit/git/GitblitReceivePackFactory.java | |
| parent | 2f122c9657aa22216d0a4d6e438bc60f9d9b6e22 (diff) | |
| parent | 5a641d8872acaa9dd8b72d0138044e28aea4745a (diff) | |
| download | gitblit-c931f40b15a00da1f82384b203dd96ba6a0dc56d.tar.gz gitblit-c931f40b15a00da1f82384b203dd96ba6a0dc56d.zip | |
Merge branch 'pr-1213' into master
Fix conflict in updated slf4j version.
Add updated Eclipse and IntelliJ files.
Diffstat (limited to 'src/main/java/com/gitblit/git/GitblitReceivePackFactory.java')
0 files changed, 0 insertions, 0 deletions