Merge branch 'master' of https://github.com/mstarke/MacPass

Browse Source

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

...

This commit is contained in:

michael starke

2015-07-15 09:21:07 +02:00

parent b53a4cdacc 2a029e0b1d

commit ebd30e7645

13 changed files with 54 additions and 7 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/nl.lproj/Localizable.strings

Binary file not shown.