]> git.sur5r.net Git - contagged/commit
Merge commit '0ca5fea0cc893684982894e474a00176853535e6' into cweiske
authorAndreas Gohr <gohr@cosmocode.de>
Tue, 26 Aug 2014 09:41:51 +0000 (11:41 +0200)
committerAndreas Gohr <gohr@cosmocode.de>
Tue, 26 Aug 2014 09:41:51 +0000 (11:41 +0200)
commitf1ddaa8817df4a82805ec3902c72554c411ad468
tree1f405426661d75da7607f6d726c6b8167b43302e
parentf761878d5f31fe5b1b53215391565d2262cf162e
parent0ca5fea0cc893684982894e474a00176853535e6
Merge commit '0ca5fea0cc893684982894e474a00176853535e6' into cweiske

* commit '0ca5fea0cc893684982894e474a00176853535e6':
  fix missing space in company address
  hide counter reset
  support non-http URLs in labeledURI fields (e.g. xmpp or mailto)
  support multiple URLs

Conflicts:
inc/functions.php
inc/functions.php
templates/entry_show.tpl