Commit 9be981ba authored by Nikolay Ilin's avatar Nikolay Ilin
Browse files

Merge branch 'dev' into 'rc'

Update .gitignore

See merge request !3
parents 58d3fdeb 498aa6b7
......@@ -12,4 +12,4 @@ nbproject
\ No newline at end of file
\ No newline at end of file
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