Merge #1952 and solve conflict

Browse Source

...

This commit is contained in:

Frederic Guillot

2016-03-06 15:40:10 -05:00

parent 4c91798781 6bdf3cccf7

commit c8de706e62

2 changed files with 6 additions and 1 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

2

assets/css/app.css

File diff suppressed because one or more lines are too long