From: <cha...@us...> - 2013-08-21 19:40:16
|
Revision: 47186 http://sourceforge.net/p/tikiwiki/code/47186 Author: changi67 Date: 2013-08-21 19:40:12 +0000 (Wed, 21 Aug 2013) Log Message: ----------- [MRG] Automatic merge, branches/11.x 47161 to 47176 Property Changed: ---------------- trunk/ Index: trunk =================================================================== --- trunk 2013-08-21 19:09:27 UTC (rev 47185) +++ trunk 2013-08-21 19:40:12 UTC (rev 47186) Property changes on: trunk ___________________________________________________________________ Modified: svn:mergeinfo ## -1,5 +1,5 ## /branches/10.x:43596-44410,44444-44836,44907 -/branches/11.x:45702-47161 +/branches/11.x:45702-47176 /branches/3.0:16998-18916 /branches/4.x:22817-23908 /branches/5.x:26025-26523,26527-28378 \ No newline at end of property This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <cha...@us...> - 2013-08-22 17:10:28
|
Revision: 47214 http://sourceforge.net/p/tikiwiki/code/47214 Author: changi67 Date: 2013-08-22 17:10:25 +0000 (Thu, 22 Aug 2013) Log Message: ----------- [MRG] Automatic merge, branches/11.x 47210 to 47213 Property Changed: ---------------- trunk/ Index: trunk =================================================================== --- trunk 2013-08-22 17:08:04 UTC (rev 47213) +++ trunk 2013-08-22 17:10:25 UTC (rev 47214) Property changes on: trunk ___________________________________________________________________ Modified: svn:mergeinfo ## -1,5 +1,5 ## /branches/10.x:43596-44410,44444-44836,44907 -/branches/11.x:45702-47210 +/branches/11.x:45702-47213 /branches/3.0:16998-18916 /branches/4.x:22817-23908 /branches/5.x:26025-26523,26527-28378 \ No newline at end of property This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <jon...@us...> - 2013-08-22 21:34:40
|
Revision: 47226 http://sourceforge.net/p/tikiwiki/code/47226 Author: jonnybradley Date: 2013-08-22 21:34:37 +0000 (Thu, 22 Aug 2013) Log Message: ----------- [MRG] Automatic merge, branches/11.x 47213 to 47225 Property Changed: ---------------- trunk/ Index: trunk =================================================================== --- trunk 2013-08-22 21:33:34 UTC (rev 47225) +++ trunk 2013-08-22 21:34:37 UTC (rev 47226) Property changes on: trunk ___________________________________________________________________ Modified: svn:mergeinfo ## -1,5 +1,5 ## /branches/10.x:43596-44410,44444-44836,44907 -/branches/11.x:45702-47213 +/branches/11.x:45702-47225 /branches/3.0:16998-18916 /branches/4.x:22817-23908 /branches/5.x:26025-26523,26527-28378 \ No newline at end of property This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <cha...@us...> - 2013-08-27 20:09:47
|
Revision: 47298 http://sourceforge.net/p/tikiwiki/code/47298 Author: changi67 Date: 2013-08-27 20:09:44 +0000 (Tue, 27 Aug 2013) Log Message: ----------- [MRG] Automatic merge, branches/11.x 47257 to 47297 Property Changed: ---------------- trunk/ Index: trunk =================================================================== --- trunk 2013-08-27 20:06:07 UTC (rev 47297) +++ trunk 2013-08-27 20:09:44 UTC (rev 47298) Property changes on: trunk ___________________________________________________________________ Modified: svn:mergeinfo ## -1,5 +1,5 ## /branches/10.x:43596-44410,44444-44836,44907 -/branches/11.x:45702-47257 +/branches/11.x:45702-47297 /branches/3.0:16998-18916 /branches/4.x:22817-23908 /branches/5.x:26025-26523,26527-28378 \ No newline at end of property This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <jon...@us...> - 2013-09-23 17:34:36
|
Revision: 47682 http://sourceforge.net/p/tikiwiki/code/47682 Author: jonnybradley Date: 2013-09-23 17:34:34 +0000 (Mon, 23 Sep 2013) Log Message: ----------- [MRG] Automatic merge, branches/11.x 47381 to 47559 Property Changed: ---------------- trunk/ Index: trunk =================================================================== --- trunk 2013-09-23 17:28:12 UTC (rev 47681) +++ trunk 2013-09-23 17:34:34 UTC (rev 47682) Property changes on: trunk ___________________________________________________________________ Modified: svn:mergeinfo ## -1,5 +1,5 ## /branches/10.x:43596-44410,44444-44836,44907 -/branches/11.x:45702-47381 +/branches/11.x:45702-47559 /branches/3.0:16998-18916 /branches/4.x:22817-23908 /branches/5.x:26025-26523,26527-28378 \ No newline at end of property This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <jon...@us...> - 2013-10-10 17:23:43
|
Revision: 47961 http://sourceforge.net/p/tikiwiki/code/47961 Author: jonnybradley Date: 2013-10-10 17:23:41 +0000 (Thu, 10 Oct 2013) Log Message: ----------- [MRG] Automatic merge, branches/12.x 47956 to 47960 Property Changed: ---------------- trunk/ Index: trunk =================================================================== --- trunk 2013-10-10 17:21:41 UTC (rev 47960) +++ trunk 2013-10-10 17:23:41 UTC (rev 47961) Property changes on: trunk ___________________________________________________________________ Modified: svn:mergeinfo ## -1,6 +1,6 ## /branches/10.x:43596-44410,44444-44836,44907 /branches/11.x:45702-47762 -/branches/12.x:47808-47956 +/branches/12.x:47808-47960 /branches/3.0:16998-18916 /branches/4.x:22817-23908 /branches/5.x:26025-26523,26527-28378 \ No newline at end of property This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <li...@us...> - 2013-10-27 02:45:28
|
Revision: 48188 http://sourceforge.net/p/tikiwiki/code/48188 Author: lindonb Date: 2013-10-27 02:45:23 +0000 (Sun, 27 Oct 2013) Log Message: ----------- [MRG] Semi-automatic merge, branches/12.x 48186. Property Changed: ---------------- trunk/ Index: trunk =================================================================== --- trunk 2013-10-27 01:55:27 UTC (rev 48187) +++ trunk 2013-10-27 02:45:23 UTC (rev 48188) Property changes on: trunk ___________________________________________________________________ Modified: svn:mergeinfo ## -1,6 +1,6 ## /branches/10.x:43596-44410,44444-44836,44907 /branches/11.x:45702-47762 -/branches/12.x:47808-48184 +/branches/12.x:47808-48186 /branches/3.0:16998-18916 /branches/4.x:22817-23908 /branches/5.x:26025-26523,26527-28378 \ No newline at end of property This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <li...@us...> - 2013-10-27 05:27:56
|
Revision: 48190 http://sourceforge.net/p/tikiwiki/code/48190 Author: lindonb Date: 2013-10-27 05:27:48 +0000 (Sun, 27 Oct 2013) Log Message: ----------- [MRG] Totally manual merge, branches/12.x 48186-48189. Property Changed: ---------------- trunk/ Index: trunk =================================================================== --- trunk 2013-10-27 04:14:28 UTC (rev 48189) +++ trunk 2013-10-27 05:27:48 UTC (rev 48190) Property changes on: trunk ___________________________________________________________________ Modified: svn:mergeinfo ## -1,6 +1,6 ## /branches/10.x:43596-44410,44444-44836,44907 /branches/11.x:45702-47762 -/branches/12.x:47808-48186 +/branches/12.x:47808-48189 /branches/3.0:16998-18916 /branches/4.x:22817-23908 /branches/5.x:26025-26523,26527-28378 \ No newline at end of property This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <lph...@us...> - 2014-01-28 17:56:48
|
Revision: 49605 http://sourceforge.net/p/tikiwiki/code/49605 Author: lphuberdeau Date: 2014-01-28 17:56:45 +0000 (Tue, 28 Jan 2014) Log Message: ----------- [MRG] Automatic merge, branches/12.x 49596 to 49604 Property Changed: ---------------- trunk/ Index: trunk =================================================================== --- trunk 2014-01-28 17:55:07 UTC (rev 49604) +++ trunk 2014-01-28 17:56:45 UTC (rev 49605) Property changes on: trunk ___________________________________________________________________ Modified: svn:mergeinfo ## -1,6 +1,6 ## /branches/10.x:43596-44410,44444-44836,44907 /branches/11.x:45702-47762 -/branches/12.x:47808-49596 +/branches/12.x:47808-49604 /branches/3.0:16998-18916 /branches/4.x:22817-23908 /branches/5.x:26025-26523,26527-28378 \ No newline at end of property This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <jon...@us...> - 2014-03-06 19:16:13
|
Revision: 50238 http://sourceforge.net/p/tikiwiki/code/50238 Author: jonnybradley Date: 2014-03-06 19:16:09 +0000 (Thu, 06 Mar 2014) Log Message: ----------- [MRG] Automatic merge, branches/12.x 50233 to 50237 Property Changed: ---------------- trunk/ Index: trunk =================================================================== --- trunk 2014-03-06 19:15:29 UTC (rev 50237) +++ trunk 2014-03-06 19:16:09 UTC (rev 50238) Property changes on: trunk ___________________________________________________________________ Modified: svn:mergeinfo ## -1,6 +1,6 ## /branches/10.x:43596-44410,44444-44836,44907 /branches/11.x:45702-47762 -/branches/12.x:47808-50233 +/branches/12.x:47808-50237 /branches/3.0:16998-18916 /branches/4.x:22817-23908 /branches/5.x:26025-26523,26527-28378 \ No newline at end of property This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <jon...@us...> - 2014-04-06 12:48:56
|
Revision: 50691 http://sourceforge.net/p/tikiwiki/code/50691 Author: jonnybradley Date: 2014-04-06 12:48:53 +0000 (Sun, 06 Apr 2014) Log Message: ----------- [MRG] Automatic merge, branches/12.x 50687 to 50690 Property Changed: ---------------- trunk/ Index: trunk =================================================================== --- trunk 2014-04-06 12:48:17 UTC (rev 50690) +++ trunk 2014-04-06 12:48:53 UTC (rev 50691) Property changes on: trunk ___________________________________________________________________ Modified: svn:mergeinfo ## -1,6 +1,6 ## /branches/10.x:43596-44410,44444-44836,44907 /branches/11.x:45702-47762 -/branches/12.x:47808-50687 +/branches/12.x:47808-50690 /branches/3.0:16998-18916 /branches/4.x:22817-23908 /branches/5.x:26025-26523,26527-28378 \ No newline at end of property This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <jon...@us...> - 2014-07-04 10:07:41
|
Revision: 51843 http://sourceforge.net/p/tikiwiki/code/51843 Author: jonnybradley Date: 2014-07-04 10:07:34 +0000 (Fri, 04 Jul 2014) Log Message: ----------- [MRG] Automatic merge, branches/13.x 51832 to 51841 Property Changed: ---------------- trunk/ Index: trunk =================================================================== --- trunk 2014-07-04 10:03:36 UTC (rev 51842) +++ trunk 2014-07-04 10:07:34 UTC (rev 51843) Property changes on: trunk ___________________________________________________________________ Modified: svn:mergeinfo ## -1,7 +1,7 ## /branches/10.x:43596-44410,44444-44836,44907 /branches/11.x:45702-47762 /branches/12.x:47808-51121,51191-51192,51342,51379-51380,51443 -/branches/13.x:51407-51832 +/branches/13.x:51407-51841 /branches/3.0:16998-18916 /branches/4.x:22817-23908 /branches/5.x:26025-26523,26527-28378 \ No newline at end of property This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <jon...@us...> - 2014-09-28 17:11:04
|
Revision: 52659 http://sourceforge.net/p/tikiwiki/code/52659 Author: jonnybradley Date: 2014-09-28 17:11:03 +0000 (Sun, 28 Sep 2014) Log Message: ----------- [MRG] Automatic merge, branches/13.x 52644 to 52657 Conflict fixed in lib/core/Tracker/Item.php (was already fixed in trunk) Property Changed: ---------------- trunk/ Index: trunk =================================================================== --- trunk 2014-09-28 16:56:12 UTC (rev 52658) +++ trunk 2014-09-28 17:11:03 UTC (rev 52659) Property changes on: trunk ___________________________________________________________________ Modified: svn:mergeinfo ## -1,7 +1,7 ## /branches/10.x:43596-44410,44444-44836,44907 /branches/11.x:45702-47762 /branches/12.x:47808-51121,51191-51192,51342,51379-51380,51443,52250 -/branches/13.x:51407-52644 +/branches/13.x:51407-52657 /branches/3.0:16998-18916 /branches/4.x:22817-23908 /branches/5.x:26025-26523,26527-28378 \ No newline at end of property This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <jon...@us...> - 2014-09-30 10:38:01
|
Revision: 52677 http://sourceforge.net/p/tikiwiki/code/52677 Author: jonnybradley Date: 2014-09-30 10:37:58 +0000 (Tue, 30 Sep 2014) Log Message: ----------- [MRG] Automatic merge, branches/13.x 52662 to 52667 Property Changed: ---------------- trunk/ Index: trunk =================================================================== --- trunk 2014-09-30 10:22:31 UTC (rev 52676) +++ trunk 2014-09-30 10:37:58 UTC (rev 52677) Property changes on: trunk ___________________________________________________________________ Modified: svn:mergeinfo ## -1,7 +1,7 ## /branches/10.x:43596-44410,44444-44836,44907 /branches/11.x:45702-47762 /branches/12.x:47808-51121,51191-51192,51342,51379-51380,51443,52250 -/branches/13.x:51407-52662,52665-52667 +/branches/13.x:51407-52667 /branches/3.0:16998-18916 /branches/4.x:22817-23908 /branches/5.x:26025-26523,26527-28378 \ No newline at end of property This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <jon...@us...> - 2014-10-03 14:31:01
|
Revision: 52707 http://sourceforge.net/p/tikiwiki/code/52707 Author: jonnybradley Date: 2014-10-03 14:30:59 +0000 (Fri, 03 Oct 2014) Log Message: ----------- [MRG] Automatic merge, branches/13.x 52695 to 52698 Property Changed: ---------------- trunk/ Index: trunk =================================================================== --- trunk 2014-10-03 14:22:02 UTC (rev 52706) +++ trunk 2014-10-03 14:30:59 UTC (rev 52707) Property changes on: trunk ___________________________________________________________________ Modified: svn:mergeinfo ## -1,7 +1,7 ## /branches/10.x:43596-44410,44444-44836,44907 /branches/11.x:45702-47762 /branches/12.x:47808-51121,51191-51192,51342,51379-51380,51443,52250 -/branches/13.x:51407-52695 +/branches/13.x:51407-52698 /branches/3.0:16998-18916 /branches/4.x:22817-23908 /branches/5.x:26025-26523,26527-28378 \ No newline at end of property This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <jon...@us...> - 2014-10-21 15:58:47
|
Revision: 52915 http://sourceforge.net/p/tikiwiki/code/52915 Author: jonnybradley Date: 2014-10-21 15:58:44 +0000 (Tue, 21 Oct 2014) Log Message: ----------- [MRG] Automatic merge, branches/13.x 52912 to 52914 Property Changed: ---------------- trunk/ Index: trunk =================================================================== --- trunk 2014-10-21 15:58:11 UTC (rev 52914) +++ trunk 2014-10-21 15:58:44 UTC (rev 52915) Property changes on: trunk ___________________________________________________________________ Modified: svn:mergeinfo ## -1,7 +1,7 ## /branches/10.x:43596-44410,44444-44836,44907 /branches/11.x:45702-47762 /branches/12.x:47808-51121,51191-51192,51342,51379-51380,51443,52250 -/branches/13.x:51407-52912 +/branches/13.x:51407-52914 /branches/3.0:16998-18916 /branches/4.x:22817-23908 /branches/5.x:26025-26523,26527-28378 \ No newline at end of property This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <jon...@us...> - 2015-02-24 12:21:22
|
Revision: 54080 http://sourceforge.net/p/tikiwiki/code/54080 Author: jonnybradley Date: 2015-02-24 12:21:21 +0000 (Tue, 24 Feb 2015) Log Message: ----------- [SVN] Ignore new (composer) log files Property Changed: ---------------- trunk/ Index: trunk =================================================================== --- trunk 2015-02-24 04:54:13 UTC (rev 54079) +++ trunk 2015-02-24 12:21:21 UTC (rev 54080) Property changes on: trunk ___________________________________________________________________ Modified: svn:ignore ## -26,3 +26,4 ## vendor node_modules themes +tiki-*.log This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <jon...@us...> - 2015-02-24 18:32:47
|
Revision: 54091 http://sourceforge.net/p/tikiwiki/code/54091 Author: jonnybradley Date: 2015-02-24 18:32:40 +0000 (Tue, 24 Feb 2015) Log Message: ----------- [MRG] Automatic merge, branches/14.x 54078 to 54090 Property Changed: ---------------- trunk/ Index: trunk =================================================================== --- trunk 2015-02-24 18:17:12 UTC (rev 54090) +++ trunk 2015-02-24 18:32:40 UTC (rev 54091) Property changes on: trunk ___________________________________________________________________ Modified: svn:mergeinfo ## -2,6 +2,7 ## /branches/11.x:45702-47762 /branches/12.x:47808-51121,51191-51192,51342,51379-51380,51443,52250,52938,53191,53608,53881 /branches/13.x:51407-53060,53145,53192,53882 +/branches/14.x:54079-54090 /branches/3.0:16998-18916 /branches/4.x:22817-23908 /branches/5.x:26025-26523,26527-28378 \ No newline at end of property This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <wa...@us...> - 2015-03-04 08:26:10
|
Revision: 54223 http://sourceforge.net/p/tikiwiki/code/54223 Author: walper Date: 2015-03-04 08:26:07 +0000 (Wed, 04 Mar 2015) Log Message: ----------- [MRG] Automatic merge, branches/14.x 54219 to 54222 Property Changed: ---------------- trunk/ Index: trunk =================================================================== --- trunk 2015-03-04 08:24:55 UTC (rev 54222) +++ trunk 2015-03-04 08:26:07 UTC (rev 54223) Property changes on: trunk ___________________________________________________________________ Modified: svn:mergeinfo ## -2,7 +2,7 ## /branches/11.x:45702-47762 /branches/12.x:47808-51121,51191-51192,51342,51379-51380,51443,52250,52938,53191,53608,53881 /branches/13.x:51407-53060,53145,53192,53882 -/branches/14.x:54079-54219 +/branches/14.x:54079-54222 /branches/3.0:16998-18916 /branches/4.x:22817-23908 /branches/5.x:26025-26523,26527-28378 \ No newline at end of property This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <wa...@us...> - 2015-03-04 08:41:09
|
Revision: 54226 http://sourceforge.net/p/tikiwiki/code/54226 Author: walper Date: 2015-03-04 08:41:02 +0000 (Wed, 04 Mar 2015) Log Message: ----------- [MRG] Automatic merge, branches/14.x 54222 to 54225 Property Changed: ---------------- trunk/ Index: trunk =================================================================== --- trunk 2015-03-04 08:39:50 UTC (rev 54225) +++ trunk 2015-03-04 08:41:02 UTC (rev 54226) Property changes on: trunk ___________________________________________________________________ Modified: svn:mergeinfo ## -2,7 +2,7 ## /branches/11.x:45702-47762 /branches/12.x:47808-51121,51191-51192,51342,51379-51380,51443,52250,52938,53191,53608,53881 /branches/13.x:51407-53060,53145,53192,53882 -/branches/14.x:54079-54222 +/branches/14.x:54079-54225 /branches/3.0:16998-18916 /branches/4.x:22817-23908 /branches/5.x:26025-26523,26527-28378 \ No newline at end of property This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <li...@us...> - 2015-04-04 22:36:13
|
Revision: 54938 http://sourceforge.net/p/tikiwiki/code/54938 Author: lindonb Date: 2015-04-04 22:36:06 +0000 (Sat, 04 Apr 2015) Log Message: ----------- [MRG] Automatic merge, branches/14.x 54935 to 54937 Property Changed: ---------------- trunk/ Index: trunk =================================================================== --- trunk 2015-04-04 22:34:34 UTC (rev 54937) +++ trunk 2015-04-04 22:36:06 UTC (rev 54938) Property changes on: trunk ___________________________________________________________________ Modified: svn:mergeinfo ## -2,7 +2,7 ## /branches/11.x:45702-47762 /branches/12.x:47808-51121,51191-51192,51342,51379-51380,51443,52250,52938,53191,53608,53881 /branches/13.x:51407-53060,53145,53192,53882 -/branches/14.x:54079-54935 +/branches/14.x:54079-54937 /branches/3.0:16998-18916 /branches/4.x:22817-23908 /branches/5.x:26025-26523,26527-28378 \ No newline at end of property This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <wa...@us...> - 2015-04-25 13:41:29
|
Revision: 55219 http://sourceforge.net/p/tikiwiki/code/55219 Author: walper Date: 2015-04-25 13:41:27 +0000 (Sat, 25 Apr 2015) Log Message: ----------- [MRG] Automatic merge, branches/14.x 55216 to 55218 Property Changed: ---------------- trunk/ Index: trunk =================================================================== --- trunk 2015-04-25 13:37:33 UTC (rev 55218) +++ trunk 2015-04-25 13:41:27 UTC (rev 55219) Property changes on: trunk ___________________________________________________________________ Modified: svn:mergeinfo ## -2,7 +2,7 ## /branches/11.x:45702-47762 /branches/12.x:47808-51121,51191-51192,51342,51379-51380,51443,52250,52938,53191,53608,53881 /branches/13.x:51407-53060,53145,53192,53882 -/branches/14.x:54079-55216 +/branches/14.x:54079-55218 /branches/3.0:16998-18916 /branches/4.x:22817-23908 /branches/5.x:26025-26523,26527-28378 \ No newline at end of property This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <jon...@us...> - 2015-09-16 09:51:25
|
Revision: 56193 http://sourceforge.net/p/tikiwiki/code/56193 Author: jonnybradley Date: 2015-09-16 09:51:23 +0000 (Wed, 16 Sep 2015) Log Message: ----------- [MRG] Automatic merge, branches/14.x 56185 to 56191 Conflicts on lib/wiki-plugins/wikiplugin_tracker.php - resolved by keeping trunk version Property Changed: ---------------- trunk/ Index: trunk =================================================================== --- trunk 2015-09-16 09:46:52 UTC (rev 56192) +++ trunk 2015-09-16 09:51:23 UTC (rev 56193) Property changes on: trunk ___________________________________________________________________ Modified: svn:mergeinfo ## -2,7 +2,7 ## /branches/11.x:45702-47762 /branches/12.x:47808-51121,51191-51192,51342,51379-51380,51443,52250,52938,53191,53608,53881,55301 /branches/13.x:51407-53060,53145,53192,53882 -/branches/14.x:54079-56185 +/branches/14.x:54079-56191 /branches/3.0:16998-18916 /branches/4.x:22817-23908 /branches/5.x:26025-26523,26527-28378 \ No newline at end of property This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <li...@us...> - 2015-09-28 02:12:38
|
Revision: 56331 http://sourceforge.net/p/tikiwiki/code/56331 Author: lindonb Date: 2015-09-28 02:12:36 +0000 (Mon, 28 Sep 2015) Log Message: ----------- [MRG] Automatic merge, branches/14.x 56328 to 56330 Expected conflicts reverted - needed to fix a file in 14x but didn't need to carry forward to trunk. Merged anyway to keep semi-automatice merge period going. lib/core/Services/Forum/Controller.php Property Changed: ---------------- trunk/ Index: trunk =================================================================== --- trunk 2015-09-28 02:06:01 UTC (rev 56330) +++ trunk 2015-09-28 02:12:36 UTC (rev 56331) Property changes on: trunk ___________________________________________________________________ Modified: svn:mergeinfo ## -2,7 +2,7 ## /branches/11.x:45702-47762 /branches/12.x:47808-51121,51191-51192,51342,51379-51380,51443,52250,52938,53191,53608,53881,55301 /branches/13.x:51407-53060,53145,53192,53882 -/branches/14.x:54079-56328 +/branches/14.x:54079-56330 /branches/3.0:16998-18916 /branches/4.x:22817-23908 /branches/5.x:26025-26523,26527-28378 \ No newline at end of property This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <jon...@us...> - 2015-09-28 15:49:10
|
Revision: 56346 http://sourceforge.net/p/tikiwiki/code/56346 Author: jonnybradley Date: 2015-09-28 15:49:08 +0000 (Mon, 28 Sep 2015) Log Message: ----------- [MRG] Automatic merge, branches/14.x 56339 to 56342 Property Changed: ---------------- trunk/ Index: trunk =================================================================== --- trunk 2015-09-28 15:38:01 UTC (rev 56345) +++ trunk 2015-09-28 15:49:08 UTC (rev 56346) Property changes on: trunk ___________________________________________________________________ Modified: svn:mergeinfo ## -2,7 +2,7 ## /branches/11.x:45702-47762 /branches/12.x:47808-51121,51191-51192,51342,51379-51380,51443,52250,52938,53191,53608,53881,55301 /branches/13.x:51407-53060,53145,53192,53882 -/branches/14.x:54079-56339 +/branches/14.x:54079-56342 /branches/3.0:16998-18916 /branches/4.x:22817-23908 /branches/5.x:26025-26523,26527-28378 \ No newline at end of property This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |