about summary refs log tree commit diff
path: root/public
diff options
context:
space:
mode:
authorDavid Yip <yipdw@member.fsf.org>2017-12-30 17:20:07 -0600
committerDavid Yip <yipdw@member.fsf.org>2017-12-30 17:20:07 -0600
commit4cca1d1e7efce51eecb64489f412a7b8631f0aed (patch)
tree5259571423a25c9a478052599c5e3d04db7fc8bd /public
parente4944d065b6bd6c6718c27700971be832ed4861a (diff)
parentf4b80e6511f21b60f71ed182bb66ca6ef0ba9f66 (diff)
Merge remote-tracking branch 'origin/master' into merge-upstream
 Conflicts:
	app/controllers/auth/confirmations_controller.rb
Diffstat (limited to 'public')
0 files changed, 0 insertions, 0 deletions