r888888888 18dd5acca7 Merge branch 'ruby-2.1' ...

Conflicts:
	app/assets/javascripts/comments.js
	app/helpers/delayed_jobs_helper.rb

2014-04-23 18:05:31 -07:00

..

assets

improve swiping logic

2014-04-12 14:59:02 -07:00

controllers

fixes #2133

2014-04-16 17:43:34 -07:00

helpers

update iqdb display helper

2014-03-24 15:02:14 -07:00

logical

fixes #2132

2014-04-17 14:17:11 -07:00

mailers

Kill trailing whitespace in ruby files

2013-03-19 23:10:10 +11:00

models

Merge branch 'ruby-2.1'

2014-04-23 18:05:31 -07:00

presenters

Add more data attributes to thumbnail previews

2014-03-14 13:57:49 -04:00

views

fix session comparison

2014-04-23 14:03:54 -07:00