Skip to content
GitLab
Commit 3a2a73d2 authored by Юлия Леонова's avatar Юлия Леонова
Browse files

Merge branch 'master' of http://195.19.32.74:2038//jleonova/hw-2-xml 

# Conflicts:
#	HW2/mainwindow.cpp
parents f70ae931 b952861b
Hide whitespace changes
Inline Side-by-side
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment