OLD 7.0 2015 08 17

Conflict:

--- a/addons/web_kanban/static/src/js/kanban.js
+++ b/addons/web_kanban/static/src/js/kanban.js
@@@ -991,7 -991,7 +991,11 @@@ instance.web_kanban.KanbanRecord = inst
          email = _.str.trim(email || '').toLowerCase();
          var default_ = _.str.isBlank(email) ? 'mm' : 'identicon';
          var email_md5 = $.md5(email);
++<<<<<<< HEAD
 +        return 'https://www.gravatar.com/avatar/' + email_md5 + '.png?s=' + size + '&d=' + default_;
++=======
+         return '//www.gravatar.com/avatar/' + email_md5 + '.png?s=' + size + '&d=' + default_;
++>>>>>>> odoo/7.0
      },
      kanban_image: function(model, field, id, cache, options) {
          options = options || {};

Resolved by reverting https://github.com/OCA/OCB/commit/0d3971a5 in favour of https://github.com/odoo/odoo/commit/11cd8ba06.

Committed as https://github.com/OCA/OCB/commit/c6c3d78443 by @StefanRijnhart