diff options
| author | Kevin Lyda <kevin@ie.suberic.net> | 2014-01-05 17:53:08 +0400 |
|---|---|---|
| committer | Kevin Lyda <kevin@ie.suberic.net> | 2014-01-05 17:53:08 +0400 |
| commit | 284546b2e00639bfa5e965f6a846cf308752d58e (patch) | |
| tree | 7a9f96e99fa67b718527a768a0c545c63f5ccf2b /public | |
| parent | dcaedb4a5e3dae774e0211935977cf4514e2a928 (diff) | |
| parent | d28ee0df124d79e9d0968c3325ae010b55d4a7b6 (diff) | |
Merge branch 'master' into logo-white-compress
Conflicts:
app/assets/images/logo-black.png
app/assets/images/logo-white.png
Diffstat (limited to 'public')
| -rw-r--r-- | public/favicon.ico | bin | 1150 -> 32988 bytes |
1 files changed, 0 insertions, 0 deletions
diff --git a/public/favicon.ico b/public/favicon.ico Binary files differindex 057f74ac7ab..bfb74960c48 100644 --- a/public/favicon.ico +++ b/public/favicon.ico |