diff options
| author | Simon L'nu <simon.lnu@gmail.com> | 2012-03-15 01:02:44 -0400 |
|---|---|---|
| committer | Simon L'nu <simon.lnu@gmail.com> | 2012-03-15 01:02:44 -0400 |
| commit | 6e133e75c3ed12a4637d9cc946b1cb838619b9cc (patch) | |
| tree | 44eb74a6943ecc26a795f136e79d653c39955d63 /view/theme/dispy-dark/contact_template.tpl | |
| parent | ebccf13c4c883e1438f4446d6aeba070ce6ee967 (diff) | |
| parent | b06c5983a4dae26dd24aecd7473bad98558cd6fc (diff) | |
| download | volse-hubzilla-6e133e75c3ed12a4637d9cc946b1cb838619b9cc.tar.gz volse-hubzilla-6e133e75c3ed12a4637d9cc946b1cb838619b9cc.tar.bz2 volse-hubzilla-6e133e75c3ed12a4637d9cc946b1cb838619b9cc.zip | |
Merge branch 'master', remote-tracking branch 'remotes/upstream/master'
* remotes/upstream/master:
don't allow multiple friends with http/https same person, don't show mail2 coming soon unless person is allowed to have email contacts
roll protocol version due to ssl_policy settings
force login to ssl on SSL_POLICY_SELFSIGN
basic ssl_policy for important modules
ssl_policy stuff
revup
splitted tests into several files
removed done TODO
get_tags tests corrected. They test for the right things now.
addon settings form error
more work on filer, comment level and file tag removal
added slack-NS, non-scrolly, slackr-based theme.
get tags test improved
splitted test cases.
changed a test string
added some tests
added library and include to .htaccess
excludes reports from git
better tests
added test blueprints, fixed? encoding issues
* master:
Diffstat (limited to 'view/theme/dispy-dark/contact_template.tpl')
0 files changed, 0 insertions, 0 deletions