Merge branch 'stable'

diff --cc cgit.c
Simple merge

diff --cc cgit.h
Simple merge

diff --cc ui-diff.c
index d97a8012cfffc4d10986c27d3f3a6f7bfa4019fd,f8782df260c03a5231ecb740658caff4e3f8a583..af24a6c4ccffa1520f383748f574dd87d0945b52
--- 1/ui-diff.c
--- 2/ui-diff.c
+++ b/ui-diff.c
@@@ -395,12 -372,9 +395,11 @@@ void cgit_print_diff(const char *new_re
                }
        }
  
-       if ((ctx.qry.ssdiff && !ctx.cfg.ssdiff) || (!ctx.qry.ssdiff && ctx.cfg.ssdiff))
-               use_ssdiff = 1;
+       use_ssdiff = ctx.qry.has_ssdiff ? ctx.qry.ssdiff : ctx.cfg.ssdiff;
  
 -      print_ssdiff_link();
 +      if (show_ctrls)
 +              cgit_print_diff_ctrls();
 +
        cgit_print_diffstat(old_rev_sha1, new_rev_sha1, prefix);
  
        if (use_ssdiff) {

diff --cc ui-log.c
Simple merge

diff --cc ui-repolist.c
Simple merge