Skip to content
Snippets Groups Projects
Commit d5e6ec0b 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 !249
parents 9a77c640 b9d063ea
Branches
Tags
1 merge request!249Merge 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 to comment