forked from Automattic/legalmattic
    
        
        - 
                Notifications
    
You must be signed in to change notification settings  - Fork 0
 
PR-merge master #1
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.
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
          
     Open
      
      
            shauvik
  wants to merge
  173
  commits into
  moquality:master
  
    
      
        
          
  
    
      Choose a base branch
      
     
    
      
        
      
      
        
          
          
        
        
          
            
              
              
              
  
           
        
        
          
            
              
              
           
        
       
     
  
        
          
            
          
            
          
        
       
    
      
from
Automattic:master
  
      
      
   
  
    
  
  
  
 
  
      
    base: master
Could not load branches
            
              
  
    Branch not found: {{ refName }}
  
            
                
      Loading
              
            Could not load tags
            
            
              Nothing to show
            
              
  
            
                
      Loading
              
            Are you sure you want to change the base?
            Some commits from the old base branch may be removed from the timeline,
            and old review comments may become outdated.
          
          
                
     Open
            
            
          Conversation
  
    
      This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
      Learn more about bidirectional Unicode characters
    
  
  
    
    Due to frequent confusion regarding how to remove the DMCA advisory message, we are removing that section.
Changes taking effect May 25, 2018.
Changes taking effect May 25, 2018.
Changes taking effect May 25, 2018.
Added more specific information to help clarify our practices, included information for Polldaddy and WooCommerce.com services, and added information to reflect the requirements of the EU’s General Data Protection Regulation. Changes take effect May 25, 2018.
Changes taking effect May 25, 2018. http://en.blog.wordpress.com/2018/05/13/new-privacy-features-and-updated-policies
Fixed formatting issues.
Added a link to a support doc.
Small typo you -> your
Included information for Simplenote, Simperium, Cloudup, and Lean Domain Search.
General reorganization and cleanup.
Accidentally changed "user agent" to "user" in last update. Reverting this change.
Polldaddy was rebranded as Crowdsignal. More details here: https://crowdsignal.com/support/crowdsignal-faq/
Polldaddy was rebranded as Crowdsignal.
Fixed formatting.
WooPay link updates
Updated date to match the user-facing TOS page
Miscellaneous updates and clarifications, including removal of section 16 (Arbitration Agreement) and updates to include certain European user rights.
Fixing a typo
Remove repeated paragraph in Wordpress TOS
Added wp.cloud to the list of our websites.
Updated the California rights section to apply to additional US states.
Miscellaneous updates, like adding USPS's Privacy Act Statement, incorporating our advertising policy, and making clear that Jetpack services are available through various plugins.
Added sections for AI features and Built By WordPress.com Express.
Miscellaneous updates and clarifications, including changing instances of “WooCommerce” to “Woo."
Changed instances of “WooCommerce” to “Woo.”
Miscellaneous updates, including clarifications to European users’ right to withdrawal as well as our relationship with third-party services sold via Woo.com and WordPress.com.
Miscellaneous updates and clarifications, including the addition of Studio and changing instands of "Woo.com" to "WooCommerce.com".
Removed the outdated list of specific US states covered by the US Privacy Laws section
Updated for Blaze Pro
Adding Beeper
Added more detail about information we collect about job applicants.
Added Telex.
  
    Sign up for free
    to join this conversation on GitHub.
    Already have an account?
    Sign in to comment
  
      
  Add this suggestion to a batch that can be applied as a single commit.
  This suggestion is invalid because no changes were made to the code.
  Suggestions cannot be applied while the pull request is closed.
  Suggestions cannot be applied while viewing a subset of changes.
  Only one suggestion per line can be applied in a batch.
  Add this suggestion to a batch that can be applied as a single commit.
  Applying suggestions on deleted lines is not supported.
  You must change the existing code in this line in order to create a valid suggestion.
  Outdated suggestions cannot be applied.
  This suggestion has been applied or marked resolved.
  Suggestions cannot be applied from pending reviews.
  Suggestions cannot be applied on multi-line comments.
  Suggestions cannot be applied while the pull request is queued to merge.
  Suggestion cannot be applied right now. Please check back later.
  
    
  
    
Updating master from Automattic.