Merge branch 'master' into handle_merge_conflicts

This commit is contained in:
Shriyansh 2016-03-24 01:01:00 +05:30
commit 1f3feeb0c9
4 changed files with 15 additions and 1 deletions

View file

@ -3,3 +3,6 @@
en:
hello: "Hello world"
time:
formats:
short: "%Y-%m-%dT%H:%M:%S"