search

cs3org / wopiserver

A vendor-neutral application gateway compatible with the WOPI specifications.
Apache License 2.0
52 stars 27 forks source link

Remove merge conflicts #12

Closed LovisaLugnegard closed 4 years ago

LovisaLugnegard commented 4 years ago

Remove merge conflicts