Merge branch 'master' of https://github.com/redmatrix/redmatrix

Browse Source

Conflicts:
	install/schema_mysql.sql
	mod/impel.php
	view/pt-br/messages.po
	view/pt-br/strings.php

...

This commit is contained in:

redmatrix

2015-05-28 19:06:31 -07:00

parent b381ec5734 df5223fe98

commit 8fe3daab21

10 changed files with 4443 additions and 2877 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

5564

view/pt-br/messages.po

File diff suppressed because it is too large Load Diff

1638

view/pt-br/strings.php

File diff suppressed because it is too large Load Diff