Skip to content
Snippets Groups Projects
Commit bdc19d22 authored by Otowa Kotori's avatar Otowa Kotori
Browse files

solve conflicts

parent 86cce72c
No related branches found
No related tags found
2 merge requests!627I18n,!617WIP: experienmental i18n support
Showing
with 91 additions and 62 deletions
Loading
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment