LemmyNet/joinlemmy-site
2
0
Fork 0
mirror of https://github.com/LemmyNet/joinlemmy-site.git synced 2024-11-21 20:01:16 +00:00
Code Issues Projects Releases Wiki Activity

Merge branch 'main' into Nutomic-patch-10

Browse source
This commit is contained in:
Nutomic 2023-10-31 14:42:18 +01:00 committed by GitHub
commit a9fe6b5c81
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 2 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
.gitmodules vendored
View file

@ -5,7 +5,7 @@
[submodule "joinlemmy-translations"]
path = joinlemmy-translations
url = https://github.com/lemmynet/joinlemmy-translations
branch = tailwind_rework
branch = main
[submodule "lemmy-translations"]
path = lemmy-translations
url = https://github.com/lemmynet/lemmy-translations

2
joinlemmy-translations

@ -1 +1 @@
Subproject commit 4e8db96053291ec8d147e41b4e6b4640dc16712f
Subproject commit 63e8c68ffc724a7e4e44de17c236c44d9b66d028

5
yarn.lock
View file

@ -7671,11 +7671,6 @@ sorted-union-stream@~2.1.3:
from2 "^1.3.0"
stream-iterate "^1.1.0"
sortpack@^2.3.5:
version "2.3.5"
resolved "https://registry.yarnpkg.com/sortpack/-/sortpack-2.3.5.tgz#822fee32dfa3d945e5511f61d24618aa9e102de1"
integrity sha512-wsU25TM7v97n57E1lBZJKEfEPDCLB4LL4Q2sauBPc8eky6nRX6b4RuOMNQZDiZC6uDNfUGrWBn4oqut6LXLoZg==
"source-map-js@>=0.6.2 <2.0.0", source-map-js@^1.0.2:
version "1.0.2"
resolved "https://registry.yarnpkg.com/source-map-js/-/source-map-js-1.0.2.tgz#adbc361d9c62df380125e7f161f71c826f1e490c"