Merge branch '4.8' into 4.9

Browse Source

Conflicts:
	client/WEB-INF/classes/resources/messages_es.properties

...

This commit is contained in:

Rohit Yadav 2016-09-02 00:38:08 +00:00

parent 8ee418b0c3 9eb8b2e90b

commit 1e0012599c

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