]> source.dussan.org Git - gitblit.git/commit
Merge branch 'pr-1213' into master
authorFlorian Zschocke <f.zschocke+git@gmail.com>
Sun, 6 Nov 2022 12:46:36 +0000 (13:46 +0100)
committerFlorian Zschocke <f.zschocke+git@gmail.com>
Sun, 6 Nov 2022 12:46:36 +0000 (13:46 +0100)
commitc931f40b15a00da1f82384b203dd96ba6a0dc56d
treede678ff660cdb45d23dcf8a72eb23a5adf17a98a
parent2f122c9657aa22216d0a4d6e438bc60f9d9b6e22
parent5a641d8872acaa9dd8b72d0138044e28aea4745a
Merge branch 'pr-1213' into master

Fix conflict in updated slf4j version.
Add updated Eclipse and IntelliJ files.
.classpath
build.moxie
gitblit.iml