1
0
Fork 1
mirror of https://gitlab.com/mangadex-pub/mangadex_at_home.git synced 2024-01-19 02:48:37 +00:00
mangadex_at_home/src/main
M 1098664814 Merge branch 'webui' of https://gitlab.com/mangadex/mangadex_at_home
 Conflicts:
	build.gradle
	src/main/java/mdnet/base/MangaDexClient.java
	src/main/java/mdnet/base/settings/ClientSettings.java
	src/main/java/mdnet/base/settings/WebSettings.java
	src/main/kotlin/mdnet/base/web/Application.kt
	src/main/resources/webui/dataReceive.js
2020-06-13 12:27:43 -05:00
..
java/mdnet Merge branch 'webui' of https://gitlab.com/mangadex/mangadex_at_home 2020-06-13 12:27:43 -05:00
kotlin/mdnet/base Add hourly cache of stats 2020-06-13 11:16:56 -05:00
resources Merge branch 'webui' of https://gitlab.com/mangadex/mangadex_at_home 2020-06-13 12:27:43 -05:00