Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: timvideos/streaming-system
base: 44d2daa1cf56
Choose a base ref
...
head repository: timvideos/streaming-system
compare: edff38391a36
Choose a head ref
  • 3 commits
  • 1 file changed
  • 2 contributors

Commits on Aug 4, 2014

  1. Copy the full SHA
    98359ae View commit details
    Browse the repository at this point in the history
  2. Merge remote-tracking branch 'up/master' into chat-toggle

    Conflicts:
    	website/frontend/templates/inroom.html
    OctoKatie committed Aug 4, 2014
    Copy the full SHA
    d235671 View commit details
    Browse the repository at this point in the history

Commits on Dec 24, 2014

  1. Merge pull request #82 from OctoKatie/chat-toggle

    IRC Chat-Twitter Feed toggle option
    ApsOps committed Dec 24, 2014
    Copy the full SHA
    edff383 View commit details
    Browse the repository at this point in the history