Age | Commit message (Collapse) | Author | |
---|---|---|---|
2010-12-07 | Merge branch '0.9.x' into merge | Brion Vibber | |
Conflicts: README actions/hostmeta.php classes/File_redirection.php lib/common.php lib/designsettings.php lib/router.php lib/util.php lib/xmppmanager.php plugins/OStatus/OStatusPlugin.php | |||
2010-10-19 | Merge branch '1.0.x' into schema-x | Brion Vibber | |
Conflicts: lib/common.php | |||
2010-10-15 | Split the core-setup bits of common.php out to framework.php (better ideas?) ↵ | Brion Vibber | |
so we can easily set up our framework to run Schema setup before we have a core database to load a live config from. |