Cleared conflict

git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@1829 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
This commit is contained in:
David Heinemeier Hansson
2005-07-14 07:07:51 +00:00
parent 19ee13867e
commit a7cca4eaa5

View File

@@ -1,7 +1,10 @@
*SVN*
* Worked around a Safari bug where it wouldn't pass headers through if the response was zero length by having render :nothing return ' ' instead of ''
* Fixed Request#subdomains to handle "foo.foo.com" correctly
*1.9.1* (11 July, 2005)
* Fixed that auto_complete_for didn't force the input string to lower case even as the db comparison was