Commit 56702a7b authored by Filipa Lacerda's avatar Filipa Lacerda

Fix conflicts for app/assets/images/icons.svg

parent 14c9de79
This source diff could not be displayed because it is too large. You can view the blob instead.
Markdown is supported
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