4 Commits

Author	SHA1	Message	Date
Evan Prodromou	ca75adf408	Update version number and codename	2011-01-12 18:14:57 -05:00
Brion Vibber	9df856e667	Merge branch '0.9.x' into merge ... 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-12-07 10:50:05 -08:00
Brion Vibber	a67160e01e	Merge branch '1.0.x' into schema-x ... Conflicts: lib/common.php	2010-10-19 15:19:46 -07:00
Brion Vibber	201efe6b62	Split the core-setup bits of common.php out to framework.php (better ideas?) so we can easily set up our framework to run Schema setup before we have a core database to load a live config from.	2010-10-15 13:33:26 -07:00