Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge branch 'master' of https://github.com/friendica/friendica | Alexander Kampmann | 2012-04-05 | 1 | -0/+0 |
| | | | | | | Conflicts: include/config.php update.php | ||||
* | apply changes to templates to testbubble | Simon L'nu | 2012-03-02 | 1 | -1/+13 |
| | | | | Signed-off-by: Simon L'nu <simon.lnu@gmail.com> | ||||
* | add remove_user hook (it looks like dreamhost changed all my file ↵ | friendica | 2012-01-18 | 1 | -0/+0 |
| | | | | permissions, this will make a nasty commit) | ||||
* | fixing conversation updates | friendica | 2011-11-24 | 1 | -2/+2 |
| | |||||
* | add expire_starred option, fix "delete selected" on some themes, new project ↵ | friendica | 2011-11-21 | 1 | -0/+13 |
name in email templates |