summaryrefslogtreecommitdiff
path: root/app/models/group.rb
diff options
context:
space:
mode:
authorAnnabel Dunstone Gray <annabel.dunstone@gmail.com>2017-01-03 17:29:13 +0000
committerAnnabel Dunstone Gray <annabel.dunstone@gmail.com>2017-01-03 17:29:13 +0000
commit4d253c356fc509d9bcc60e77a016d40ba66957f8 (patch)
tree769b144ecfda7aba8a7f01699025f3909cc28818 /app/models/group.rb
parent5136e72c31681e8c443074ed1443db4cb69e8fbe (diff)
parent197ca6baaaa1651cc83c90bc21b6579958ddeebc (diff)
downloadgitlab-ce-4d253c356fc509d9bcc60e77a016d40ba66957f8.tar.gz
Merge branch 'additional-award-emoji-repositioning-fixes' into 'master'
Removed bottom padding from merge manually from CLI because of repositioning award emoji's See merge request !8398
Diffstat (limited to 'app/models/group.rb')
0 files changed, 0 insertions, 0 deletions