Merge remote-tracking branch 'origin/master'

2015-01-17 12:39:41 +01:00 · 2015-01-17 12:39:41 +01:00 · ac6c7a5c79
parent 599a88c34a 53cb527c7f
commit ac6c7a5c79
1 changed files with 1 additions and 1 deletions
--- a/app/assets/javascripts/pagination.coffee
+++ b/app/assets/javascripts/pagination.coffee
@ -12,5 +12,5 @@ jQuery ->
        $.getScript more_posts_url, ->
          $this.text('Load more').removeClass('disabled') if $this
          loading_posts = false
-        $('[data-toggle="tooltip"]').tooltip()
+          $('[data-toggle="tooltip"]').tooltip()
      return