Merge remote-tracking branch 'upstream/develop' into develop

This commit is contained in:
gianantoniopini
2021-06-01 09:28:35 +02:00
133 changed files with 44807 additions and 13339 deletions
+2 -2
View File
@@ -1,11 +1,10 @@
import dayjs from 'dayjs';
import 'dayjs/locale/ar';
import 'dayjs/locale/bn';
import 'dayjs/locale/cs';
import 'dayjs/locale/da';
import 'dayjs/locale/de';
import 'dayjs/locale/en';
import 'dayjs/locale/el';
import 'dayjs/locale/en';
import 'dayjs/locale/es';
import 'dayjs/locale/fa';
import 'dayjs/locale/fi';
@@ -26,6 +25,7 @@ import 'dayjs/locale/sv';
import 'dayjs/locale/tr';
import 'dayjs/locale/uk';
import 'dayjs/locale/zh';
import dayjs from 'dayjs';
import relativeTime from 'dayjs/plugin/relativeTime';
dayjs.extend(relativeTime);
+1 -1
View File
@@ -1,5 +1,5 @@
import { clone, get, isEmpty } from 'lodash';
import dayjs from 'dayjs';
import { get, isEmpty, clone } from 'lodash';
export const getModalText = (isEditMode, type, t) =>
isEditMode