Skip to content
Snippets Groups Projects
Commit d240c8fd 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 !97
parents 155499a2 77f11731
No related branches found
No related tags found
1 merge request!97Merge branch 'dev' into 'master'
......@@ -19,3 +19,4 @@ AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
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