Merge branch 'patch-3' of https://github.com/Legolasindar/ACE3

Browse Source

Conflicts:
	addons/medical/stringtable.xml

...

This commit is contained in:

esteldunedain 2015-04-10 16:25:07 -03:00

parent ee8af7f153 58d13237f8

commit 8715a9c4a1

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