merge: branch 'master' into production

This commit is contained in:
Paul Makles 2022-07-18 13:07:04 +01:00
commit 9a70bb0eff
3 changed files with 5 additions and 3 deletions

2
external/lang vendored

@ -1 +1 @@
Subproject commit 1a8542166173445602c0a4a8f821806002fd2fc4 Subproject commit cf0b1893b66bbe100580ed2f2950d1ce125aee10

View file

@ -182,7 +182,7 @@ const Container = styled.div<{ largeEmoji: boolean }>`
/** /**
* Regex for matching execessive blockquotes * Regex for matching execessive blockquotes
*/ */
const RE_QUOTE = /(^(?:>\s){5})[>\s]+(.*$)/gm; const RE_QUOTE = /(^(?:>\s?){5})[>\s?]+(.*$)/gm;
/** /**
* Sanitise Markdown input before rendering * Sanitise Markdown input before rendering

View file

@ -27,7 +27,9 @@ export function App() {
<Masks /> <Masks />
<Switch> <Switch>
<Route path="/login/verify/:token"> <Route path="/login/verify/:token">
<Login /> <LoadSuspense>
<Login />
</LoadSuspense>
</Route> </Route>
<Route path="/login/reset/:token"> <Route path="/login/reset/:token">
<LoadSuspense> <LoadSuspense>