Branch: refs/heads/tiff_proofreading
  Home:   https://github.com/languagetool-org/languagetool-website
  Commit: d3ec44417923861977d3a0b622d3be915b43e4a0
      
https://github.com/languagetool-org/languagetool-website/commit/d3ec44417923861977d3a0b622d3be915b43e4a0
  Author: Christopher Blum <[email protected]>
  Date:   2017-07-31 (Mon, 31 Jul 2017)

  Changed paths:
    M www/index.php

  Log Message:
  -----------
  Set cookie lifetime to 365 days


  Commit: 4410ea5c71a2a6ba885dfc0bfd1a2e756d60f029
      
https://github.com/languagetool-org/languagetool-website/commit/4410ea5c71a2a6ba885dfc0bfd1a2e756d60f029
  Author: Christopher Blum <[email protected]>
  Date:   2017-07-31 (Mon, 31 Jul 2017)

  Changed paths:
    M include/footer.php
    M include/header.php
    M include/page_start.php
    M include/partials/stage_head.php
    M www/css/style.css
    M www/css/style.less
    M www/de/index.php
    M www/team/index.php

  Log Message:
  -----------
  Merge branch 'master' into tiff_proofreading

Conflicts:
        include/footer.php
        include/header.php
        include/page_start.php
        include/partials/stage_head.php
        www/css/style.css
        www/css/style.less


Compare: 
https://github.com/languagetool-org/languagetool-website/compare/4b2d50591dfc...4410ea5c71a2
------------------------------------------------------------------------------
Check out the vibrant tech community on one of the world's most
engaging tech sites, Slashdot.org! http://sdm.link/slashdot
_______________________________________________
Languagetool-commits mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/languagetool-commits

Reply via email to