Merge branch 'test/merge' into 'develop'

Merge of test/merge to develop test2

See merge request o2oa/o2oa!992

o2web/COPYING

@@ -659,5 +659,3 @@ specific requirements.
 if any, to sign a "copyright disclaimer" for the program, if necessary.
 For more information on this, and how to apply and follow the GNU AGPL, see
 <https://www.gnu.org/licenses/>.
-
-test