Skip to content
Snippets Groups Projects
Commit d5fa495b authored by Filipa Lacerda's avatar Filipa Lacerda Committed by John Jarvis
Browse files

Merge branch 'tz-load-emojis-from-server-not-cdn' into 'master' 

Removes the CDN loading for emojis.json

See merge request gitlab-org/gitlab-ce!26102
parent 2d4c1c46
Hide whitespace changes
Inline Side-by-side
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment