Merge branch 'fix-typo' of https://github.com/mariosangiorgio/MacPass into mariosangiorgio-fix-typo

Browse Source

# Conflicts:
#	MacPass/en.lproj/Localizable.strings

...

This commit is contained in:

michael starke

2015-07-15 09:23:50 +02:00

parent ebd30e7645 20fe0757fd

commit 37882bb9ad

1 changed files with 0 additions and 0 deletions

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Download Patch File Download Diff File Expand all files Collapse all files

BIN

MacPass/en.lproj/Localizable.strings

Binary file not shown.