Commit 0938d9c4 authored by Mahdi Yari's avatar Mahdi Yari
Browse files

Merge branch 'develop' into 'edit-texts' 

# Conflicts:
#   index.html
parents 473ee0d7 a09c2dde
Show whitespace changes
Inline Side-by-side
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Please to comment