Code

Update from mainstream#1

Code

Merged

slipeer merged 11 commits intoslipeer:masterslipeer/sydent:masterfrom matrix-org:mastermatrix-org/sydent:masterCopy head branch name to clipboardApr 10, 2017

+95-26

Commits

Commits on Feb 4, 2017

• Change README examples from camelcase to underscore because e39348e

  sim6

  committed
  8eb9115

  Copy full SHA for 8eb9115

• Change README example from tokenId to sid because 056a3e9

  sim6

  committed
  0ce03ec

  Copy full SHA for 0ce03ec

• Change README sid example from int to string because ea73b0a

  sim6

  committed
  da5bdba

  Copy full SHA for da5bdba

Commits on Mar 28, 2017

• Remove IP address from verification emails

  Show description for b665fd2
  dbkr

  committed
  b665fd2

  Copy full SHA for b665fd2

Commits on Mar 30, 2017

• Merge pull request #37 from sim6/sim6_fix_readme_examples

  Show description for b89b26d
  dbkr

  authored
  b89b26d

  Copy full SHA for b89b26d

• Fix README examples to be JSON

  Show description for bef1fa5
  dbkr

  committed
  bef1fa5

  Copy full SHA for bef1fa5

Commits on Mar 31, 2017

• Proposed wording change - vastly more words to fix element-hq/element-web#2547

  lampholder

  committed
  435b897

  Copy full SHA for 435b897

• A few very minor punctuation/wording tweaks

  lampholder

  committed
  14e8367

  Copy full SHA for 14e8367

• Merge pull request #40 from matrix-org/registration_wording_change

  Show description for 4bf5b20
  dbkr

  authored
  4bf5b20

  Copy full SHA for 4bf5b20

• Adding some more words to the matrix registration email template, too.

  lampholder

  committed
  2ff4ead

  Copy full SHA for 2ff4ead

• Merge pull request #41 from matrix-org/registration_wording_change

  Show description for 2d60e73
  dbkr

  authored
  2d60e73

  Copy full SHA for 2d60e73