Merge branch 'jw/commit-decorations'

Conflicts:
	cgit.css

Signed-off-by: Lars Hjemli <hjemli@gmail.com>

1 file changed, 1 insertion, 0 deletions

diff --git a/ui-log.h b/ui-log.hindex 877e40e2..60340556 100644--- a/ui-log.h+++ b/ui-log.h@@ -3,5 +3,6 @@  extern void cgit_print_log(const char *tip, int ofs, int cnt, char *grep, 			   char *pattern, char *path, int pager);+extern void show_commit_decorations(struct commit *commit);  #endif /* UI_LOG_H */
diff --git a/ui-log.h b/ui-log.h
index 877e40e2..60340556 100644
--- a/ui-log.h
+++ b/ui-log.h
@@ -3,5 +3,6 @@
 
 extern void cgit_print_log(const char *tip, int ofs, int cnt, char *grep,
 			   char *pattern, char *path, int pager);
+extern void show_commit_decorations(struct commit *commit);
 
 #endif /* UI_LOG_H */