Maximilian Grundke 1decf62897 Merge remote-tracking branch 'origin/master' into request-for-comments-multiple-files ...

# Conflicts:
#	app/views/request_for_comments/show.html.erb

2016-03-02 16:33:45 +01:00

..

assets

Delete scaffolded stylesheets

2016-03-02 16:29:58 +01:00

controllers

Merge pull request #41 from leoselig/master

2016-03-01 13:03:12 +01: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

Merge pull request #41 from leoselig/master

2016-03-01 13:03:12 +01:00

policies

Add authorization to CodeHarborLink controller

2016-02-04 11:42:03 +01:00

uploaders

transferred Code Ocean from original repository to GitHub

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

views

Merge remote-tracking branch 'origin/master' into request-for-comments-multiple-files

2016-03-02 16:33:45 +01:00