Changeset 387808

Timestamp:

05/23/2011 01:01:59 AM (15 years ago)

Author:

michael_porter

Message:

 

File:

• site-template/trunk/readme.txt (modified) (1 diff)

site-template/trunk/readme.txt

@@ -46 +46 @@
  = 1.0 =
   - rewrote the copy site code so it skips the API and dips directly in the database.  Should support custom content types, and fix bugs with menu creation, but not sure on either as I could not reproduce.
+<<<<<<< .mine
   - added code to support templates when creating site at the same time as registering.
 
+= 1.1 =
+  - moved site template options into the sites menu on the network admin page
+=======
+  - added code to support templates when creating site at the same time as registering.
+
+>>>>>>> .r387807