Merge remote-tracking branch 'origin/103-autotest-conf' into 103-autotest-conf

Browse Source

# Conflicts:
#	src/test/java/IndexConferenceTest.java

...

This commit is contained in:

Nightblade73 2019-05-10 23:38:54 +04:00

parent 6edcf8f594 4686406954

commit 3f32a61ed2

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