1
0
mirror of https://github.com/laurent22/joplin.git synced 2025-06-15 23:00:36 +02:00

Merge branch 'master' into alarm-support

This commit is contained in:
Laurent Cozic
2017-11-24 17:09:24 +00:00
379 changed files with 30742 additions and 10859 deletions

View File

@ -1,4 +1,4 @@
import moment from 'moment';
const moment = require('moment');
let time = {
@ -48,4 +48,4 @@ let time = {
}
export { time };
module.exports = { time };