Skip to content
Snippets Groups Projects
Commit 3ef2aed6 authored by Sirieam Marie Hunke's avatar Sirieam Marie Hunke
Browse files

Merge branch 'dev' into 'master'

Merge branch 'dev' into 'master'

See merge request !160
parents c6a195e1 97551c9f
No related branches found
No related tags found
1 merge request!160Merge branch 'dev' into 'master'
......@@ -20,3 +20,4 @@ LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
SOFTWARE.
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment