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

Browse Source

Conflicts:
	include/zot.php
	install/update.php
	util/messages.po

...

This commit is contained in:

redmatrix

2015-08-23 20:23:55 -07:00

parent a67213627c 852d19f209

commit eac9c8a7e6

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

744

view/es/messages.po

File diff suppressed because it is too large Load Diff

742

view/es/strings.php

File diff suppressed because it is too large Load Diff