Ralf Teusner e7b3f48fc8 Merge branch 'master' into disable_rfcs ...

# Conflicts:
#	config/deploy.rb

2018-05-25 10:08:44 +02:00

..

assets

Merge pull request #169 from openHPI/edge-compat

2018-05-16 14:59:13 +02:00

controllers

merged master into disable_rfcs

2018-05-16 17:44:28 +02:00

helpers

Implement ranged user queries

2018-04-25 13:58:40 +02:00

mailers

Send emails

2018-02-26 17:55:18 +01:00

models

merged master into disable_rfcs

2018-05-16 17:44:28 +02:00

policies

Scaffold user and rfc activity history routes

2018-04-24 10:28:30 +02:00

uploaders

transferred Code Ocean from original repository to GitHub

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

views

Merge branch 'master' into disable_rfcs

2018-05-25 10:08:44 +02:00