Merge remote-tracking branch 'origin/pr-cache-control' into pr-cache-control

Browse Source

# Conflicts:
#	src/test/scala/gitbucket/core/view/AvatarImageProviderSpec.scala

...

This commit is contained in:

KOUNOIKE Yuusuke

2017-03-14 07:38:45 +09:00

parent 8087531d64 c939456f21

commit 0d5964bd22

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Download Patch File Download Diff File Expand all files Collapse all files

Diff Content Not Available