Homec4science

Merge remote-tracking branch 'upstream/master'

Authored by pangratz <pangratz666@gmail.com> on Dec 12 2011, 14:02.

Description

Merge remote-tracking branch 'upstream/master'

Event Timeline

pangratz <pangratz666@gmail.com> committed rGITIGNORE94f45ecd5cf5: Merge remote-tracking branch 'upstream/master' (authored by pangratz <pangratz666@gmail.com>).Dec 12 2011, 14:02

Merged Changes

CommitAuthorDetailsCommitted
85d179675a14Chris Wanstrath
Merge pull request #225 from frankel/master 
Dec 5 2011
171709e8e888frankel
config/*.yml should not be ignored in Rails 
Dec 4 2011