[02:28] Tiki-KGB 03lindonb r48184 10branches/12.x/ 10composer.lock 10composer.json 10doc/devtools/satis.json
[02:28] Tiki-KGB tablesorter: add latest version 2.12.0 and remove 2.11.1 from satis.json (only supposed to edit satis.json in trunk but added this version in 12.x so should reverse it out here just this once I think)
[02:57]  Caarrie|away joined #tikiwiki
[02:28] Tiki-KGB 03lindonb r48185 10trunk/composer.json 10trunk/_htaccess 10trunk 10trunk/composer.lock
[02:28] Tiki-KGB [MRG] Automatic merge, branches/12.x 48178 to 48184. Manually fixed conflicts in tim-create, composer.json and composer.lock
[02:42] Tiki-KGB 03lindonb r48186 10branches/12.x/templates/ 10(14 files)
[02:42] Tiki-KGB admin wizard: Additional cleaning of presentation and text (thanks xavi). Feel free to add back some info if too minimalist.
[02:56] Tiki-KGB 03lindonb r48187 10trunk/ 10(6 files in 6 dirs)
[02:56] Tiki-KGB [MRG] Semi-automatic merge, branches/12.x 48178 to 48184, part 2. Some files didn't commit in r48185 for some reason.
[02:57]  lindonb joined #tikiwiki
[03:40]  chibaguy joined #tikiwiki
[03:46] Tiki-KGB 03lindonb r48188 10trunk * [MRG] Semi-automatic merge, branches/12.x 48186.
[05:16] Tiki-KGB 03lindonb r48189 10branches/12.x/templates/ 10(9 files) * admin wizard: conforming cleanup
[06:28] Tiki-KGB 03lindonb r48190 10trunk * [MRG] Totally manual merge, branches/12.x 48186-48189.
[06:34] Tiki-KGB 03lindonb r48191 10trunk/templates/ 10(20 files)
[06:34] Tiki-KGB Totally manual merge, branches/12.x 48186-48189. Files did not commit n r48190 for some reason
[06:47]  chibaguy joined #tikiwiki
[06:47] chibaguy polom
[09:21]  arctanx joined #tikiwiki
[10:21]  arctanx left #tikiwiki
[10:39]  Emenems joined #tikiwiki
[11:24]  arildb joined #tikiwiki
[11:45]  Telesight joined #tikiwiki
[11:46]  Telesight joined #tikiwiki
[11:52]  Telesight joined #tikiwiki
[12:03]  Telesight left #tikiwiki
[12:37]  Telesight joined #tikiwiki
[16:48]  Telesight joined #tikiwiki
[16:57]  Serg_ joined #tikiwiki
[17:07]  Telesight joined #tikiwiki
[18:41]  marclaporte joined #tikiwiki
[19:57]  dbalieiro joined #tikiwiki
[20:05] Tiki|bot New Forum Posts: Tiki 12 Alpha on dev.t.o - http://tiki.org/tiki-view_forum_thread.php?forumId=26&comments_parentId=49865
[21:11]  redflo joined #tikiwiki
[21:25] Tiki|bot Recent Bug:  - Spreadsheet: Potential CSS regression in Tiki12, with line-height  - http://dev.tiki.org/item4818
[23:31]  marclaporte joined #tikiwiki
[23:57]  marclaporte joined #tikiwiki