Merge remote-tracking branch 'origin/master'

This commit is contained in:
Andreas N 2015-01-17 12:39:41 +01:00
commit ac6c7a5c79
1 changed files with 1 additions and 1 deletions

View File

@ -12,5 +12,5 @@ jQuery ->
$.getScript more_posts_url, -> $.getScript more_posts_url, ->
$this.text('Load more').removeClass('disabled') if $this $this.text('Load more').removeClass('disabled') if $this
loading_posts = false loading_posts = false
$('[data-toggle="tooltip"]').tooltip() $('[data-toggle="tooltip"]').tooltip()
return return