yujunjun/strapi
1
0
Fork 0
mirror of https://github.com/strapi/strapi.git synced 2025-10-03 12:26:19 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' into chore/eslint-config-front

Browse Source
This commit is contained in:
cyril lopez 2020-01-21 18:00:52 +01:00 committed by GitHub
commit b5f2824f6d
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
packages/strapi-plugin-content-manager/admin/src/components/CustomTable/DATE_FORMATS.js
View File

@ -2,7 +2,7 @@ const DATE_FORMATS = {
date: 'dddd, MMMM Do YYYY', date: 'dddd, MMMM Do YYYY',
datetime: 'dddd, MMMM Do YYYY HH:mm', datetime: 'dddd, MMMM Do YYYY HH:mm',
time: 'HH:mm A', time: 'HH:mm A',
timestamp: 'dddd, MMMM Do YYYY', timestamp: 'dddd, MMMM Do YYYY HH:mm',
}; };
export default DATE_FORMATS; export default DATE_FORMATS;