summaryrefslogtreecommitdiff
path: root/app/models/note.rb
diff options
context:
space:
mode:
authorJan-Gerd Tenberge <janten@gmail.com>2015-10-22 21:37:44 +0200
committerJan-Gerd Tenberge <janten@gmail.com>2015-10-22 21:37:44 +0200
commitb32bb377993fb0224ed3bd9294d752d1a82b2ef9 (patch)
tree7925a37c6e51a7be339d934282164071b935441e /app/models/note.rb
parent34d0cd438a7173c35c687ecb37eae1f3293b84b5 (diff)
parent7d7b6dbb9f2a8c6dbee8ab6eb0ab075705abcfbd (diff)
downloadgitlab-ce-b32bb377993fb0224ed3bd9294d752d1a82b2ef9.tar.gz
Merge remote-tracking branch 'origin/master' into gravatar-retina
Diffstat (limited to 'app/models/note.rb')
0 files changed, 0 insertions, 0 deletions