summaryrefslogtreecommitdiff
path: root/app/controllers
diff options
context:
space:
mode:
authorazul <azul@riseup.net>2016-08-15 09:26:39 +0000
committerazul <azul@riseup.net>2016-08-15 09:26:39 +0000
commit1457fcdae08a1cd7e1e7b36668f826547d2c7cf6 (patch)
tree59b563bc3f10ed7d2438f6284f96478c592d3ddf /app/controllers
parenta1d62a3a1492ca21e1e1d2344fac88bb4d93f324 (diff)
parent75c037e5d6d8b8f2b98477bdd0359f5687bd7517 (diff)
Merge branch 'test/gitlab-ci' into 'develop'
[ci] get gitlab to run tests See merge request !2
Diffstat (limited to 'app/controllers')
0 files changed, 0 insertions, 0 deletions