Skip to content
Snippets Groups Projects
Commit 00b162a9 authored by AnHardt's avatar AnHardt
Browse files

Merge remote-tracking branch 'origin/utf-kanji' into tm-utf-minus-kanji 

Conflicts:
	Marlin/language.h
Conflict cleaned
parents cbe44961 e38dd5f0
No related branches found
No related tags found
Hide whitespace changes
Inline Side-by-side
Showing
with 1511 additions and 745 deletions
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment