4 Commits

Author	SHA1	Message	Date
Jason White	4b99eb6d4c	Merge remote-tracking branch 'upstream/develop' into develop	2017-01-31 12:02:25 -05:00
Nanne Baars	ee5a12d205	Provide Server-side service to support UI localization #265 (#322) ... merging	2017-01-31 11:52:33 -05:00
Jason White	1b2f54accc	#319 updated content for proxy	2017-01-31 11:38:57 -05:00
Jason White	2b31a19143	#319	2017-01-27 15:39:31 -05:00