Changeset [362b653012210abaab315d69e931ba27facb0838] by Gaspard Bucher
Revision 362b653012210abaab315d69e931ba27facb0838,
committed by Gaspard Bucher
· March 2nd, 2009 @ 09:42 AM
Merge branch 'master' into rails2
Conflicts:
lib/use_zafu.rb
test/test_zena.rb
vendor/rails
7 changed files
-
M
app/helpers/application_helper.rb -
M
app/models/iformat.rb -
M
db/migrate/048_link_source_target_can_be_null.rb -
M
lib/zena/use/public_attributes.rb -
M
test/test_zena.rb -
M
test/unit/dyn_attributes_test.rb -
M
test/unit/iformat_test.rb