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

Browse Source

Conflicts:
	view/nl/messages.po
	view/nl/strings.php

...

This commit is contained in:

redmatrix

2015-10-17 16:38:57 -07:00

parent 1d2797dc1f 1e8fc8b062

commit be701677d6

5 changed files with 8783 additions and 17705 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

14406

view/nl/messages.po

File diff suppressed because it is too large Load Diff

3078

view/nl/strings.php

File diff suppressed because it is too large Load Diff