Merge branch 'dev' into jajaja

# Conflicts:
#	package.json
#	yarn.lock
This commit is contained in:
Mike Cao committed 2025-03-31 23:31:09 -05:00
commit c71e9b5707
11 files changed
+126 -30

No files matched your search

+1 -1
View File
@@ -7,7 +7,7 @@ const formats = {
millisecond: 'T',
second: 'pp',
minute: 'p',
hour: 'h:mm aaa - PP',
hour: 'p - PP',
day: 'PPPP',
week: 'PPPP',
month: 'LLLL yyyy',