Merge branch 'master' of https://github.com/khoa-le/discourse into update-locale-vietnamese

Browse source

* 'master' of https://github.com/khoa-le/discourse:
  Update tranlation code

# Conflicts:
#	config/locales/client.vi.yml
#	config/locales/server.vi.yml
#	plugins/poll/config/locales/client.vi.yml
#	plugins/poll/config/locales/server.vi.yml
#	public/403.vi.html
#	public/422.vi.html
#	public/500.vi.html
#	public/503.vi.html
#	vendor/gems/discourse_imgur/lib/discourse_imgur/locale/server.vi.yml

...

This commit is contained in:

Khoa, Le Ngoc 2016-01-22 16:20:49 +07:00

parent 4bce8f37b0 2a9c7d0099

commit 905e69a67f

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Show stats Download patch file Download diff file Expand all files Collapse all files

Diff content is not available