John Geiger 6bb5b53bad Merge branch 'master' into john-graph ...

# Conflicts:
#	Gemfile

2016-05-12 16:02:38 +02:00

..

assets

Merge branch 'master' into john-graph

2016-05-12 16:02:38 +02:00

controllers

Merge pull request #53 from openHPI/fix-file-creation-behavior

2016-05-10 18:34:21 +02:00

helpers

Scaffold CodeHarbourLink with field oauth2token

2016-02-04 11:02:26 +01:00

mailers

fixed multiple style guide violations

2015-02-17 10:23:01 +01:00

models

Fix exercise update

2016-05-12 14:39:00 +02:00

policies

Let everyone see all comments and polish request for comments overview

2016-05-10 18:17:02 +02:00

uploaders

transferred Code Ocean from original repository to GitHub

2015-01-22 10:01:32 +01:00

views

Merge branch 'master' into john-graph

2016-05-12 16:02:38 +02:00