Merge branch 'issue-70' of github.com:TheSerapher/php-mmcfe-ng into issue-70

Browse Source

Conflicts:
	public/include/classes/transaction.class.php
	public/include/config/global.inc.dist.php
	public/templates/mmcFE/account/transactions/default.tpl

...

This commit is contained in:

Sebastian Grewe 2013-06-10 18:58:12 +02:00

parent b4a09f22ee 31e51061f7

commit 146b4e0c17

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Show Stats Download Patch File Download Diff File Expand all files Collapse all files

Diff Content Not Available