[01:22:24] <wm-bot>	 Change on 12en_wikipedia a page Wikipedia:Huggle/Feedback was modified, changed by Lowercase sigmabot III link https://en.wikipedia.org/w/index.php?diff=599801486 edit summary: Archiving 1 discussion(s) to [[Wikipedia:Huggle/Feedback/Archive 18]]) (bot
[01:22:27] <wm-bot>	 Change on 12en_wikipedia a page Wikipedia:Huggle/Feedback/Archive 18 was modified, changed by Lowercase sigmabot III link https://en.wikipedia.org/w/index.php?diff=599801489 edit summary: Archiving 1 discussion(s) from [[Wikipedia:Huggle/Feedback]]) (bot
[09:47:39] <Not-003>	 [02huggle3-qt-lx] 07benapetr pushed 031 commit to 03master [+0/-0/±6] 13http://git.io/FyVa_g
[09:47:41] <Not-003>	 [02huggle3-qt-lx] 07benapetr 0306a71a3 - TP TS and moved some code from main window this timestamp will be used as a workaround for that missing mediawiki feature because of which we have to reparse the talk page everytime before we send the warning to user
[13:39:43] <wm-bot>	 Change on 12en_wikipedia a page Wikipedia:Huggle/Users was modified, changed by Skr15081997 link https://en.wikipedia.org/w/index.php?diff=599859878 edit summary: Adding [[Special:Contributions/Skr15081997|Skr15081997]] ([[WP:HG|HG]])
[15:07:01] <Not-003>	 [02huggle3-qt-lx] 07benapetr pushed 031 commit to 03master [+0/-0/±10] 13http://git.io/JuPFvA
[15:07:03] <Not-003>	 [02huggle3-qt-lx] 07benapetr 03fc20357 - fixed Now we don't message a user if their talk page is too old
[15:07:17] <Not-003>	 [02huggle3-qt-lx] 07benapetr pushed 031 commit to 03master [+0/-0/±1] 13http://git.io/NR6GDA
[15:07:18] <Not-003>	 [02huggle3-qt-lx] 07benapetr 035197bb9 - fixed a stupid bug in software rollback
[15:49:05] <Not-003>	 [02huggle3-qt-lx] 07benapetr pushed 031 commit to 03master [+0/-0/±2] 13http://git.io/AubrXw
[15:49:06] <Not-003>	 [02huggle3-qt-lx] 07benapetr 039ab8800 - fix - we need to decrease the user warning level in case we failed to deliver the warning - time of talk page wasn't synced so it didn't work much
[17:34:50] <Not-003>	 [02huggle3-qt-lx] 07benapetr pushed 031 commit to 03master [+0/-0/±2] 13http://git.io/VKtv_g
[17:34:52] <Not-003>	 [02huggle3-qt-lx] 07benapetr 03e949368 - debugging
[17:51:35] <Not-003>	 [02huggle3-qt-lx] 07benapetr pushed 031 commit to 03master [+0/-0/±1] 13http://git.io/U-M-lw
[17:51:36] <Not-003>	 [02huggle3-qt-lx] 07benapetr 0394b13f8 - removed some debug info
[19:48:53] <petan>	 addshore: can u merge 2 branches? :P
[19:48:56] <petan>	 because I can't lol
[19:49:05] <petan>	 addshore: I need merge master into ubuntu
[19:49:11] <petan>	 but all strategies fail
[19:49:20] <petan>	 except for "ours" which does nothing
[22:09:46] <Not-003>	 [02huggle3-qt-lx] 07benapetr pushed 03124 commits to 03ubuntu [+1867/-188/±503] 13http://git.io/oEouEQ
[22:09:48] <Not-003>	 [02huggle3-qt-lx] 07benapetr 03aa8593b - Merge branch 'master' into ubuntu Conflicts: README.md huggle/config.hpp huggle/configuration.hpp
[22:14:41] <Not-003>	 [02huggle3-qt-lx] 07benapetr pushed 031 commit to 03ubuntu [+0/-0/±1] 13http://git.io/KG9b3g
[22:14:42] <Not-003>	 [02huggle3-qt-lx] 07benapetr 033ef8774 - dch -i [ci skip]
[22:15:58] <Not-003>	 [02huggle3-qt-lx] 07benapetr pushed 031 commit to 03ubuntu [+0/-0/±1] 13http://git.io/Rkti6w
[22:16:00] <Not-003>	 [02huggle3-qt-lx] 07benapetr 032e8c578 - defs
[22:38:38] <Not-003>	 [02huggle3-qt-lx] 07benapetr pushed 031 commit to 03master [+0/-0/±1] 13http://git.io/u9gkeA
[22:38:40] <Not-003>	 [02huggle3-qt-lx] 07benapetr 0383dccbb - fixed