Merge branch 'master' into handle_merge_conflicts
This commit is contained in:
commit
1f3feeb0c9
4 changed files with 15 additions and 1 deletions
|
|
@ -3,3 +3,6 @@
|
|||
|
||||
en:
|
||||
hello: "Hello world"
|
||||
time:
|
||||
formats:
|
||||
short: "%Y-%m-%dT%H:%M:%S"
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue