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

..

_excerpt.html.erb

fixes #651

2013-03-23 22:53:33 -04:00

_form.html.erb

Kill trailing whitespace in erb files

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

_quick_search.html.erb

Merge branch 'testing'

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

_recent_changes.html.erb

fix pool version link

2013-02-04 18:34:25 -08:00

_secondary_links.html.erb

fixes #975

2013-03-22 10:24:01 -07:00

_sidebar.html.erb

fixes #983

2013-03-20 00:18:34 -07:00

destroy.js.erb

wiki page work

2011-03-11 17:02:27 -05:00

edit.html.erb

Kill trailing whitespace in erb files

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

index.html.erb

fixes #989

2013-03-20 00:13:35 -07:00

new.html.erb

fixes #1122; fix typo in fix for #725

2013-03-28 19:36:13 -04:00

search.html.erb

Kill trailing whitespace in erb files

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

show.html.erb

fixes #1122; fix typo in fix for #725

2013-03-28 19:36:13 -04:00