Merge remote-tracking branch 'origin/master'

Browse source

Conflicts:
	languages/fr_FR.json

...

This commit is contained in:

Frédéric K 2015-08-29 23:15:18 +02:00

parent f7a2213749 9cb4473dac

commit 93bd041a37

1 changed files with 17 additions and 17 deletions

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

Show stats Download patch file Download diff file Expand all files Collapse all files