Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge branch 'master' of https://github.com/friendica/friendica | Alexander Kampmann | 2012-04-05 | 1 | -8/+17 |
|\ | | | | | | | | | | | Conflicts: include/config.php update.php | ||||
| * | provide a way to specify an admin account for siteinfo if more than one have ↵ | friendica | 2012-03-29 | 1 | -1/+5 |
| | | | | | | | | admin email address | ||||
| * | bug #329 - compress the plugin list on the friendica info page | friendica | 2012-03-24 | 1 | -7/+12 |
|/ | |||||
* | 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) | ||||
* | update link locations | friendica | 2011-12-13 | 1 | -2/+2 |
| | |||||
* | little stuff - name change, live updates, new network types | friendica | 2011-11-23 | 1 | -3/+3 |
| | |||||
* | rename | Friendika | 2011-10-30 | 1 | -0/+68 |