Mirrors/plane
1
0
Fork 0
mirror of https://github.com/makeplane/plane.git synced 2026-07-13 14:01:45 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #258 from makeplane/sync/ce-ee

Browse Source 
sync: merge conflicts need to be resolved
This commit is contained in:
sriram veeraghanta
2024-05-16 17:58:47 +05:30
committed by GitHub
parent 7b0d4607a3 669faf7c72
commit 6b11f2f45b
3 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
space/components/account/auth-forms/auth-root.tsx
View File

@@ -1,7 +1,7 @@
"use client";
import React, { FC, useEffect, useState } from "react";
import { observer } from "mobx-react";
import { observer } from "mobx-react-lite";
import { useSearchParams } from "next/navigation";
import { IEmailCheckData } from "@plane/types";
// components

2
space/components/account/auth-forms/password.tsx
View File

@@ -1,7 +1,7 @@
"use client";
import React, { useEffect, useMemo, useState } from "react";
import { observer } from "mobx-react";
import { observer } from "mobx-react-lite";
import { Eye, EyeOff, XCircle } from "lucide-react";
import { Button, Input, Spinner } from "@plane/ui";
// components

2
space/components/account/oauth/oauth-options.tsx
View File

@@ -1,4 +1,4 @@
import { observer } from "mobx-react";
import { observer } from "mobx-react-lite";
// components
import { GithubOAuthButton, GoogleOAuthButton } from "@/components/account";
// hooks