Skip to content
Snippets Groups Projects
Commit 54d7c74e authored by Othm1ne's avatar Othm1ne
Browse files

Merge remote-tracking branch 'origin/master' 

# Conflicts:
#	app/src/main/res/drawable/polygon_1.png
#	app/src/main/res/drawable/polygon_2.png
#	app/src/main/res/drawable/polygon_3.png
#	app/src/main/res/drawable/polygon_4.png
#	app/src/main/res/drawable/rectangle_1.png
#	app/src/main/res/drawable/rectangle_5.png
parents 28c53780 2c4e39c7
No related branches found
No related tags found
Hide whitespace changes
Inline Side-by-side
Showing
with 250 additions and 40 deletions
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment