Merge https://github.com/redmatrix/redmatrix into pending_merge

Browse Source

Conflicts:
	include/zot.php
	view/de/messages.po
	view/de/strings.php

...

This commit is contained in:

redmatrix

2015-09-30 16:31:06 -07:00

parent 4b7c052ed8 5265c190d4

commit 54e7d5d260

4 changed files with 6765 additions and 6359 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

10693

view/de/messages.po

File diff suppressed because it is too large Load Diff

2412

view/de/strings.php

File diff suppressed because it is too large Load Diff