Files
MacPass/MacPass.xcodeproj
Michael Starke a47557672f Merge branch 'master' into feature/use_local_plugins_json
# Conflicts:
#	MacPass/de.lproj/Localizable.strings
#	MacPass/en.lproj/Localizable.strings
2019-07-12 16:55:38 +02:00
..