Commit Graph

4 Commits

Author SHA1 Message Date
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
albert
a1675c65a8 fixes #1144 2013-03-30 15:18:52 -04:00
Toks
445e677956 adds placeholder text to quick search 2013-03-30 14:43:42 -04:00
albert
4724dbf824 fixes #1005 2013-03-20 09:31:08 -07:00