Skip to content
Snippets Groups Projects
Commit 121f6d04 authored by Dmitriy Zaporozhets's avatar Dmitriy Zaporozhets
Browse files

fixed conflicts

parent b8ca1d62
No related branches found
No related tags found
No related merge requests found
Hide whitespace changes
Inline Side-by-side
app/assets/images/ajax-loader.gif
+ 0
− 0
View replaced file @ b8ca1d62 View file @ 121f6d04
app/assets/images/ajax-loader.gif

6.66 KiB | W: 66px | H: 66px

app/assets/images/ajax-loader.gif

4.08 KiB | W: 32px | H: 32px

app/assets/images/ajax-loader.gif
app/assets/images/ajax-loader.gif
app/assets/images/ajax-loader.gif
app/assets/images/ajax-loader.gif
  • 2-up
  • Swipe
  • Onion skin
public/favicon.ico 100644 → 100755
+ 0
− 0
View file @ 121f6d04
No preview for this file type
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