tree 7f235d242bf20005d7593a37490e7300d0f39cd8
parent 915e49cd205aa25b0453df34dcd8ab42f378dca5
parent 9631c9a9f36bc27b42dc40dcb3723833864e48b3
author David Pursehouse <dpursehouse@collab.net> 1548130659 +0900
committer David Pursehouse <dpursehouse@collab.net> 1548130659 +0900

Merge branch 'stable-2.15' into stable-2.16

* stable-2.15:
  Fix support for deleting branches (if you have can_delete)
  FileApi: Add a method to set a file's "reviewed" flag

Change-Id: I72b3ece539223452a8cd446825d20eacbb82f153