Преглед на файлове

Merge branch 'test/merge' into 'develop'

Merge of test/merge to develop test2

See merge request o2oa/o2oa!992
胡起 преди 6 години
родител
ревизия
89b8b64e61
променени са 1 файла, в които са добавени 0 реда и са изтрити 2 реда
  1. 0 2
      o2web/COPYING

+ 0 - 2
o2web/COPYING

@@ -659,5 +659,3 @@ 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