Commit Graph

14 Commits

Author SHA1 Message Date
Tim Bentley 5cf1be6d88 Merge branch 'oct_2020' into 'master'
Oct 2020 - Fixes

See merge request openlp/openlp_api_tester!6
2020-10-20 14:09:09 +00:00
Tim Bentley d036f2d25e Oct 2020 - Fixes 2020-10-20 14:09:08 +00:00
Tim Bentley 43b715b935 Merge branch 'master' into 'master'
Master update

See merge request openlp/openlp_api_tester!5
2020-10-04 19:00:31 +00:00
Tim Bentley 4df94691e8 Master update 2020-10-04 19:00:31 +00:00
Tim Bentley c74aaeda91 Merge branch 'resolve' into 'master'
Resolve - issues

See merge request openlp/openlp_api_tester!4
2020-06-26 14:25:03 +00:00
Tim Bentley 7bd7d9eafd Merge branch 'master' of gitlab.com:openlp/openlp_api_tester
# Conflicts:
#	test_api/apitest/runner.py
2020-06-26 14:25:03 +00:00
Tim Bentley ddb8d1ac73 Merge branch 'queues' into 'master'
Queues

See merge request openlp/openlp_api_tester!3
2020-06-26 13:57:22 +00:00
Tim Bentley 49a94bf3dd Queues 2020-06-26 13:57:22 +00:00
Tim Bentley de2f630de0 Merge branch 'fixes2' into 'master'
Fixes2

See merge request openlp/openlp_api_tester!2
2020-06-21 08:57:12 +00:00
Tim Bentley 26cbcb96b1 Fixes2 2020-06-21 08:57:12 +00:00
Tim Bentley 34a22984ff Merge branch 'fixes_01' into 'master'
Fixes 01

See merge request openlp/openlp_api_tester!1
2020-06-20 10:27:43 +00:00
Tim Bentley d5bcc35175 Fixes 01 2020-06-20 10:27:43 +00:00
Tim Bentley f2f07faf60 Add README.md 2020-06-20 07:56:29 +00:00
Tim 4cfa890c7c
Initial Commit 2020-06-20 08:53:44 +01:00