Skip to content
This repository has been archived by the owner on Oct 14, 2018. It is now read-only.

mer #370

Open
wants to merge 30 commits into
base: master
Choose a base branch
from
Open

mer #370

wants to merge 30 commits into from

Commits on Mar 26, 2015

  1. boobs plg updated

    @AckiyBolt
    AckiyBolt committed Mar 26, 2015
    Configuration menu
    Copy the full SHA
    fca76e0 View commit details
    Browse the repository at this point in the history

  2. some slave plg added

    @AckiyBolt
    AckiyBolt committed Mar 26, 2015
    Configuration menu
    Copy the full SHA
    b1d2ef2 View commit details
    Browse the repository at this point in the history

Commits on Mar 27, 2015

  1. whoami plg added

    @AckiyBolt
    AckiyBolt committed Mar 27, 2015
    Configuration menu
    Copy the full SHA
    8205d6d View commit details
    Browse the repository at this point in the history

  2. small changes

    @AckiyBolt
    AckiyBolt committed Mar 27, 2015
    Configuration menu
    Copy the full SHA
    c7fec4b View commit details
    Browse the repository at this point in the history

Commits on Mar 28, 2015

  1. small updates

    @AckiyBolt
    AckiyBolt committed Mar 28, 2015
    Configuration menu
    Copy the full SHA
    a4b26fd View commit details
    Browse the repository at this point in the history

Commits on Mar 29, 2015

  1. magic ball plg added

    @AckiyBolt
    AckiyBolt committed Mar 29, 2015
    Configuration menu
    Copy the full SHA
    65c7515 View commit details
    Browse the repository at this point in the history

  2. plg updates

    @AckiyBolt
    AckiyBolt committed Mar 29, 2015
    Configuration menu
    Copy the full SHA
    6c9cc5c View commit details
    Browse the repository at this point in the history

Commits on Mar 30, 2015

  1. plg updates

    @AckiyBolt
    AckiyBolt committed Mar 30, 2015
    Configuration menu
    Copy the full SHA
    adee106 View commit details
    Browse the repository at this point in the history

Commits on Apr 6, 2015

  1. fap plg created

    @AckiyBolt
    AckiyBolt committed Apr 6, 2015
    Configuration menu
    Copy the full SHA
    63a1e49 View commit details
    Browse the repository at this point in the history

  2. small plg updates

    @AckiyBolt
    AckiyBolt committed Apr 6, 2015
    Configuration menu
    Copy the full SHA
    aac7129 View commit details
    Browse the repository at this point in the history

  3. gitignore updated

    @AckiyBolt
    AckiyBolt committed Apr 6, 2015
    Configuration menu
    Copy the full SHA
    b15833f View commit details
    Browse the repository at this point in the history

  4. Merge remote-tracking branch 'upstream/master' 

    Conflicts:
	plugins/echo.lua
	plugins/youtube.lua
    @AckiyBolt
    AckiyBolt committed Apr 6, 2015
    Configuration menu
    Copy the full SHA
    aa422b2 View commit details
    Browse the repository at this point in the history

Commits on Apr 9, 2015

  1. plg fixes

    @AckiyBolt
    AckiyBolt committed Apr 9, 2015
    Configuration menu
    Copy the full SHA
    35607c5 View commit details
    Browse the repository at this point in the history

Commits on Apr 15, 2015

  1. curr plg added

    @AckiyBolt
    AckiyBolt committed Apr 15, 2015
    Configuration menu
    Copy the full SHA
    8144602 View commit details
    Browse the repository at this point in the history

  2. plg changes

    @AckiyBolt
    AckiyBolt committed Apr 15, 2015
    Configuration menu
    Copy the full SHA
    38c681b View commit details
    Browse the repository at this point in the history

  3. imdb plg fix

    @AckiyBolt
    AckiyBolt committed Apr 15, 2015
    Configuration menu
    Copy the full SHA
    aa10157 View commit details
    Browse the repository at this point in the history

Commits on Apr 16, 2015

  1. weather prints wind, default loc is Kyiv

    @AckiyBolt
    AckiyBolt committed Apr 16, 2015
    Configuration menu
    Copy the full SHA
    dc8aa69 View commit details
    Browse the repository at this point in the history

Commits on Apr 18, 2015

  1. danbooru plg added

    @AckiyBolt
    AckiyBolt committed Apr 18, 2015
    Configuration menu
    Copy the full SHA
    0bf7071 View commit details
    Browse the repository at this point in the history

  2. gps update

    @AckiyBolt
    AckiyBolt committed Apr 18, 2015
    Configuration menu
    Copy the full SHA
    48423fe View commit details
    Browse the repository at this point in the history

  3. Merge remote-tracking branch 'upstream/master' 

    Conflicts:
	.gitignore
	bot/bot.lua
	plugins/boobs.lua
	plugins/echo.lua
	plugins/stats.lua
    @AckiyBolt
    AckiyBolt committed Apr 18, 2015
    Configuration menu
    Copy the full SHA
    15e6d86 View commit details
    Browse the repository at this point in the history

  4. weather plg upd

    @AckiyBolt
    AckiyBolt committed Apr 18, 2015
    Configuration menu
    Copy the full SHA
    e12fbff View commit details
    Browse the repository at this point in the history

  5. weather plg upd

    @AckiyBolt
    AckiyBolt committed Apr 18, 2015
    Configuration menu
    Copy the full SHA
    1ae085a View commit details
    Browse the repository at this point in the history

Commits on May 16, 2015

  1. Merge commit 'b85de2d346bb53a766b07e05f65beca314fb0f9d' 

    Conflicts:
	plugins/imdb.lua
	plugins/media.lua
	plugins/weather.lua
    @AckiyBolt
    AckiyBolt committed May 16, 2015
    Configuration menu
    Copy the full SHA
    1d5e76e View commit details
    Browse the repository at this point in the history

  2. Merge remote-tracking branch 'upstream/master'

    @AckiyBolt
    AckiyBolt committed May 16, 2015
    Configuration menu
    Copy the full SHA
    7141f04 View commit details
    Browse the repository at this point in the history

Commits on May 18, 2015

  1. plg fix

    Konstantin Belentsov committed May 18, 2015
    Configuration menu
    Copy the full SHA
    b5039cd View commit details
    Browse the repository at this point in the history

Commits on Aug 18, 2015

  1. Merge branch 'yagop' 

    Conflicts:
	plugins/echo.lua
	plugins/youtube.lua
    @AckiyBolt
    AckiyBolt committed Aug 18, 2015
    Configuration menu
    Copy the full SHA
    f40fb42 View commit details
    Browse the repository at this point in the history

  2. weather rollback

    @AckiyBolt
    AckiyBolt committed Aug 18, 2015
    Configuration menu
    Copy the full SHA
    b7b036f View commit details
    Browse the repository at this point in the history

  3. dan fix

    @AckiyBolt
    AckiyBolt committed Aug 18, 2015
    Configuration menu
    Copy the full SHA
    60557e4 View commit details
    Browse the repository at this point in the history

Commits on Aug 27, 2015

  1. Merge remote-tracking branch 'yagop/master' 

    Conflicts:
	bot/bot.lua
	plugins/echo.lua
    @AckiyBolt
    AckiyBolt committed Aug 27, 2015
    Configuration menu
    Copy the full SHA
    909686b View commit details
    Browse the repository at this point in the history

Commits on Jan 11, 2016

  1. Merge branch 'master-upstream' 

    Conflicts:
	plugins/imdb.lua
    @AckiyBolt
    AckiyBolt committed Jan 11, 2016
    Configuration menu
    Copy the full SHA
    d391c3c View commit details
    Browse the repository at this point in the history