Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Pull Request for Chat Widget Merge #14

Merged
merged 6 commits into from
May 30, 2014
Merged

Pull Request for Chat Widget Merge #14

merged 6 commits into from
May 30, 2014

Commits on May 15, 2014

  1. Merge pull request #9 from amethystlei/master 

    Message Arena and Contest Plan Calendar UI Prototype
    @skyhit
    skyhit committed May 15, 2014
    Configuration menu
    Copy the full SHA
    f19bac2 View commit details
    Browse the repository at this point in the history

Commits on May 16, 2014

  1. updating gruntfile to use new environment variable for cdn

    @mdesiderio
    mdesiderio committed May 16, 2014
    Configuration menu
    Copy the full SHA
    d19d79c View commit details
    Browse the repository at this point in the history

  2. adding task to zip build folder for deploy

    @mdesiderio
    mdesiderio committed May 16, 2014
    Configuration menu
    Copy the full SHA
    3fa456a View commit details
    Browse the repository at this point in the history

Commits on May 30, 2014

  1. updated chat widget

    @countcain
    countcain committed May 30, 2014
    Configuration menu
    Copy the full SHA
    8d0356a View commit details
    Browse the repository at this point in the history

  2. merged chat widget

    @countcain
    countcain committed May 30, 2014
    Configuration menu
    Copy the full SHA
    4fdbb13 View commit details
    Browse the repository at this point in the history

  3. merge conflict fixed

    @countcain
    countcain committed May 30, 2014
    Configuration menu
    Copy the full SHA
    104a382 View commit details
    Browse the repository at this point in the history