Merge branch 'develop'

2015-03-18 21:26:52 +01:00 · 2015-03-18 21:26:52 +01:00 · 860df7ebf2
parent 642b3e5710 1773ff0b33
commit 860df7ebf2
1 changed files with 0 additions and 7 deletions
--- a/app/views/static/about.html.haml
+++ b/app/views/static/about.html.haml
@ -13,13 +13,6 @@
          = succeed '!' do
            = APP_CONFIG['site_name']
          %br/
-          .media
-            .pull-left
-              %a{href: show_user_profile_path('nilsding')}
-                %img.img-rounded.answerbox--img{src: User.find_by_screen_name('nilsding').profile_picture.url(:medium)}
-            .media-body
-              %h4.entry-text.entry-about nilsding
-              %h6.entry-subtext Backend, Server & Code
          .media
            .pull-left
              %a{href: show_user_profile_path('pixeldesu')}