source.dussan.org Git - redmine.git/commit

]> source.dussan.org Git - redmine.git/commit

author	Eric Davis <edavis@littlestreamsoftware.com>
	Wed, 21 Oct 2009 22:35:03 +0000 (22:35 +0000)
committer	Eric Davis <edavis@littlestreamsoftware.com>
	Wed, 21 Oct 2009 22:35:03 +0000 (22:35 +0000)
commit	ff3d0fe4db014885de3497931b4b98fad0cafac1
tree	f20ded2d238b57e71ed59407aec49b645f6fd5e9	tree \| snapshot
parent	2e0cbd2840ffb9fdb355ed0afd6b8684f2549bc7	commit \| diff

Fixed some merge bugs. #4077

git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@2952 e93f8b46-1217-0410-a6f0-8f06a7374b81

Mirror of redmine code source: https://github.com/redmine/redmine

app/helpers/custom_fields_helper.rb		diff \| blob \| history
app/models/time_entry_activity_custom_field.rb		diff \| blob \| history
app/views/enumerations/list.rhtml		diff \| blob \| history
public/stylesheets/application.css		diff \| blob \| history
test/fixtures/custom_values.yml		diff \| blob \| history