Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Tlawrence/sf 2316 #62

Closed
wants to merge 12 commits into from
Closed

Tlawrence/sf 2316 #62

Changes from 1 commit
Commits
Show all changes
12 commits
Select commit Hold shift + click to select a range
ce17793
Merge pull request #37 from tumblr/tlawrence/SF-2316
TravisL12 Apr 16, 2018
004178d
Localizations for each langague
Apr 16, 2018
88576ac
Merge pull request #38 from tumblr/tlawrence/SF-2323/tos-localizations
TravisL12 Apr 17, 2018
97d2c1e
Move english PP and TOS files
Apr 19, 2018
0153b28
Merge pull request #39 from tumblr/tlawrence/correct-english-file-loc…
TravisL12 Apr 19, 2018
dd417b4
Update de,es,it,fr
Apr 24, 2018
2ec3fee
Merge pull request #40 from tumblr/tlawrence/SF-2340/update-privacy-f…
TravisL12 Apr 24, 2018
bc74049
Updated english PP and ToS
May 9, 2018
7ad5058
Add text back
May 9, 2018
c3c5e67
Merge pull request #41 from tumblr/tlawrence/SF-2355/gdpr-updates-pp-tos
TravisL12 May 9, 2018
89dc82e
Updated API license
Sep 12, 2018
bb280b7
Merge pull request #1 from royaldlfei/tlawrence/api-license-update
del13-commits Dec 30, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
Add text back
  • Loading branch information
Travis Lawrence committed May 9, 2018
commit 7ad5058c9ff20d57d7f4ce7d5f0fdf2f32a05cab
4 changes: 3 additions & 1 deletion terms-of-service.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,6 @@
LAST MODIFIED: 2018-04-17
TERMS OF SERVICE LAST MODIFIED: 2018-04-17

Tumblr is a U.S. company and subject to U.S. laws and jurisdiction. The original version of these Terms of Service (and any other terms, policies, or guidelines that we provide to you) are written in English. To the extent any translated version of these Terms of Service (or any other terms, policies, or guidelines that we provide to you) conflicts with the English version, the English version controls.

THESE TERMS OF SERVICE CONTAIN LIMITATIONS OF TUMBLR'S LIABILITY IN SECTION 14.

Expand Down