diff options
author | h-v-smacker <hans-von-smacker+github@gmail.com> | 2018-07-14 21:44:44 +0300 |
---|---|---|
committer | h-v-smacker <hans-von-smacker+github@gmail.com> | 2018-07-14 21:44:44 +0300 |
commit | 4b267bcde860f081616748d38010a38352672a00 (patch) | |
tree | f0f2fbf004c87427efb5ca9144bfcc6c11052207 /locale/template.txt | |
parent | 69709206eb0264e348694b64b5749593bf2a8b69 (diff) | |
parent | 739f3a7ac4d221590383d5d8cd97f821c7d61b87 (diff) |
merge resolution
Diffstat (limited to 'locale/template.txt')
0 files changed, 0 insertions, 0 deletions