Commit 121f6d04 authored by Dmitriy Zaporozhets's avatar Dmitriy Zaporozhets

fixed conflicts

parent b8ca1d62
app/assets/images/ajax-loader.gif

6.66 KB | W: 0px | H: 0px

app/assets/images/ajax-loader.gif

4.08 KB | W: 0px | H: 0px

  • 2-up
  • Swipe
  • Onion skin
No preview for this file type
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