Browse Source

Merge branch 'test/merge' into 'develop'

Merge of test/merge to develop test

See merge request o2oa/o2oa!990
胡起 5 years ago
parent
commit
a855d3a37e
1 changed files with 2 additions and 0 deletions
  1. 2 0
      o2web/COPYING

+ 2 - 0
o2web/COPYING

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