]> Untitled Git - lemmy-ui.git/commitdiff
Merge branch 'main' into route-data-refactor
authorabias <abias1122@gmail.com>
Fri, 16 Jun 2023 22:17:17 +0000 (18:17 -0400)
committerabias <abias1122@gmail.com>
Fri, 16 Jun 2023 22:17:17 +0000 (18:17 -0400)
1  2 
package.json
src/shared/components/community/community.tsx
src/shared/components/home/admin-settings.tsx
src/shared/components/home/home.tsx
src/shared/components/post/create-post.tsx
src/shared/components/post/post.tsx
src/shared/utils.ts

diff --cc package.json
Simple merge
Simple merge
Simple merge
index 97d05fca56933ffe9f9cef648c1f86d630a8eaba,df7673a47b6a1e8e860a41b764bf70c58745b464..7007a214ffdeb67a48338ae3b6ed2b5dae29ee38
@@@ -42,16 -42,9 +42,16 @@@ import moment from "moment"
  import tippy from "tippy.js";
  import Toastify from "toastify-js";
  import { getHttpBase } from "./env";
- import { i18n, languages } from "./i18next";
+ import { i18n } from "./i18next";
 -import { CommentNodeI, DataType, IsoData, VoteType } from "./interfaces";
 +import {
 +  CommentNodeI,
 +  DataType,
 +  IsoData,
 +  RouteData,
 +  VoteType,
 +} from "./interfaces";
  import { HttpService, UserService } from "./services";
 +import { RequestState } from "./services/HttpService";
  
  let Tribute: any;
  if (isBrowser()) {