Toks c51c3e800a Merge branch 'testing' ...

Conflicts:
	app/views/artists/_quick_search.html.erb
	app/views/pools/_quick_search.html.erb
	app/views/tags/_quick_search.html.erb
	app/views/wiki_pages/_quick_search.html.erb

2013-03-30 15:50:31 -04:00

..

assets

adds placeholder text to quick search

2013-03-30 14:43:42 -04:00

controllers

fixes #1108

2013-03-29 15:37:28 -04:00

helpers

fixes #858

2013-03-29 09:59:14 -04:00

logical

should fix #165

2013-03-30 13:54:01 -04:00

mailers

Kill trailing whitespace in ruby files

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

models

Merge branch 'master' of github.com:r888888888/danbooru

2013-03-30 12:14:19 -04:00

presenters

fixes #739

2013-03-30 13:21:39 -04:00

views

Merge branch 'testing'

2013-03-30 15:50:31 -04:00