Recheck uploads when drupal and non-drupal branches are merged
The fixes in !35 (merged) might have a conflict with !33 (merged) when the drupal branch will be merged into drupal-2-ckan, since there we removed the resource-url-type input field.
The issues connected to both MR should be rechecked when the merge is made.