annotate app/views/attachments/upload.api.rsb @ 1485:c8d3ad483bea redmine-2.4-integration

Fix stray merge markers
author Chris Cannam <chris.cannam@soundsoftware.ac.uk>
date Wed, 15 Jan 2014 13:34:12 +0000
parents 433d4f72a19b
children
rev   line source
Chris@1115 1 api.upload do
Chris@1115 2 api.token @attachment.token
Chris@1115 3 end