Merge branch 'master' into Dispencer-UI-change

This commit is contained in:
Fermi
2021-01-17 22:19:45 +00:00
218 changed files with 2223 additions and 819 deletions
@@ -365,9 +365,9 @@ export const TeleLogs = (props, context) => {
);
};
export const CustomMsg = context => {
export const CustomMsg = (props, context) => {
const { act, data } = useBackend(context);
const fake_message = data.fake_message || {
const fake_message = data.fake_message !== {} ? data.fake_message : {
'sender': 'System Administrator',
'job': 'Admin',
'recepient': null,
File diff suppressed because one or more lines are too long