Merge branch 'dev' into test

This commit is contained in:
Daniel Herrero 2017-11-16 07:52:21 +01:00
commit e9bb56a045
2 changed files with 1 additions and 1 deletions

View File

Before

Width:  |  Height:  |  Size: 15 KiB

After

Width:  |  Height:  |  Size: 15 KiB

View File

@ -1,7 +1,7 @@
{ {
"initial:before": { "initial:before": {
"loopback#favicon": { "loopback#favicon": {
"params": "$!../../favicon.ico" "params": "$!../favicon.ico"
} }
}, },
"initial": { "initial": {