diff options
author | Louise Crow <louise.crow@gmail.com> | 2014-01-29 13:11:48 +0000 |
---|---|---|
committer | Louise Crow <louise.crow@gmail.com> | 2014-01-29 13:11:48 +0000 |
commit | 1356d84f4fe8df454dcdb80a9782e323020daefe (patch) | |
tree | 94639e78baa209d19a22e4bda19bc62873556eb9 | |
parent | e3b0227230807d8471c7311520f599bba3806f3f (diff) | |
parent | c526168388918e309af51ea26274cb7a13b46acc (diff) |
Merge branch 'master' into develop
-rw-r--r-- | lib/views/general/_orglink.html.erb | 2 | ||||
-rw-r--r-- | logo.png | bin | 0 -> 1606 bytes |
2 files changed, 1 insertions, 1 deletions
diff --git a/lib/views/general/_orglink.html.erb b/lib/views/general/_orglink.html.erb index 6a83ffb..2b91e73 100644 --- a/lib/views/general/_orglink.html.erb +++ b/lib/views/general/_orglink.html.erb @@ -1 +1 @@ -<%= link_to image_tag('alaveteli-logo.png'), frontpage_url, :id=>'logo' %> +<%= link_to image_tag('logo.png'), frontpage_url, :id=>'logo' %> diff --git a/logo.png b/logo.png Binary files differnew file mode 100644 index 0000000..8b88458 --- /dev/null +++ b/logo.png |