fixes conflicts with master

Browse Source

...

This commit is contained in:

rgarcia

2016-07-19 15:50:22 +02:00

parent 075c6c24b9 24a9d77e64

commit a23666683f

18 changed files with 317 additions and 44 deletions

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Download Patch File Download Diff File Expand all files Collapse all files

0

app/assets/images/custom/.keep Normal file