rebase, resolve conflicts

Author: Marco Napetti

src/controllers/krate/metadata.rs

@@ -329,7 +329,6 @@ pub async fn versions(
     conduit_compat(move || {
         let conn = state.db_read()?;
         let krate: Crate = Crate::by_name(&crate_name).first(&*conn)?;
-
         // to keep retrocompatibility, we paginate only if per_page parameter is present
         let (mut versions_and_publishers, meta) = if req.query().get("per_page").is_some() {
             let pagination_options = PaginationOptions::builder().gather(&req)?;