Merge remote-tracking branch 'upstream/develop' into 1508-vier-popup-menu

Browse source

Conflicts:
	mod/dfrn_notify.php

...

This commit is contained in:

Michael Vogel 2015-08-30 10:44:29 +02:00

parent 31fffcf281 3d614a0fcd

commit cc3419f101

4 changed files with 8160 additions and 7991 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

13300

view/cs/messages.po

View file

File diff suppressed because it is too large Load diff

2822

view/cs/strings.php

View file

File diff suppressed because it is too large Load diff