Merge TW

database/edugain_schema.sql

@@ -507,8 +507,8 @@ DROP TABLE IF EXISTS `federation`;
 /*!40101 SET @saved_cs_client     = @@character_set_client */;
 /*!40101 SET character_set_client = utf8 */;
 CREATE TABLE `federation` (
-  `fed_id` char(20) COLLATE utf8_unicode_ci NOT NULL,
-  `code` char(20) COLLATE utf8_unicode_ci DEFAULT NULL,
+  `code` char(20) COLLATE utf8_unicode_ci NOT NULL,
+  `fed_id` char(20) COLLATE utf8_unicode_ci DEFAULT NULL,
   `europe` tinyint(1) DEFAULT NULL,
   `contact_email` varchar(100) COLLATE utf8_unicode_ci DEFAULT NULL,
   `url` varchar(255) COLLATE utf8_unicode_ci DEFAULT NULL,