Skip to content
GitLab
Commit 681d45aa authored by Randy Boring's avatar Randy Boring
Browse files

Merge branch 'master' of https://github.com/keymanapp/keyman into ios-ui-anti-globalism 

resolved conflict with LanguageLMDetailViewController.swift and LanguageLMDetailViewController.xib
and KeyboardSwitcherViewController.swift
parents 0ff2297e 01dda405
Hide whitespace changes
Inline Side-by-side
Supports Markdown
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