diff options
| author | David Yip <yipdw@member.fsf.org> | 2018-01-24 23:10:19 -0600 |
|---|---|---|
| committer | David Yip <yipdw@member.fsf.org> | 2018-01-24 23:10:19 -0600 |
| commit | 00ce2be148a06ddd7e692ce963dfab356e331629 (patch) | |
| tree | 42631b78f2ad352b9368a746cbcb84e06c74808b /config/locales/ja.yml | |
| parent | 0e10667fbe8b565b05dd2f34c3ee14bed7f36967 (diff) | |
| parent | 7e07e61a302815c8e141d02756280213e7b6f391 (diff) | |
Merge remote-tracking branch 'origin/master' into gs-master
Conflicts: .travis.yml
Diffstat (limited to 'config/locales/ja.yml')
0 files changed, 0 insertions, 0 deletions