Stas Vovk 79fcb98084 Merge remote-tracking branch 'upstream/master' into PLT-637 ...

Conflicts:
	web/react/utils/constants.jsx

2015-10-16 14:21:51 +03:00

..

async_client.jsx

Removed Preference.AltId

2015-10-13 12:29:31 -04:00

client.jsx

Removed Preference.AltId

2015-10-13 12:29:31 -04:00

constants.jsx

Merge remote-tracking branch 'upstream/master' into PLT-637

2015-10-16 14:21:51 +03:00

emoticons.jsx

Merge pull request #982 from hmhealey/plt547

2015-10-08 13:19:39 -04:00

markdown.jsx

Don't auto-add http:// to mailto: and ftp: markdown links

2015-10-14 21:44:09 +02:00

text_formatting.jsx

Don't auto-add http:// to mailto: and ftp: markdown links

2015-10-14 21:44:09 +02:00

utils.jsx

Merge remote-tracking branch 'upstream/master' into PLT-637

2015-10-16 14:21:51 +03:00