| 2016-07-22 |
Fixed merge conflicts API/I18n -> Rails 4.2
Brian Riley
committed
on 22 Jul 2016
|
|---|---|
|
Merged conflicts
Brian Riley
committed
on 22 Jul 2016
|
|
|
merge
DamodarSojka
committed
on 22 Jul 2016
|
|
|
localization based on url
DamodarSojka
committed
on 22 Jul 2016
|
|
| 2016-07-21 |
Fixed issue with location of web-console in the Gemfile.
briley
committed
on 21 Jul 2016
|
| 2016-07-20 |
Merge branch 'adding_api_and_localisation_work'
xsrust
committed
on 20 Jul 2016
|
| 2016-07-15 |
Merge pull request #8 from CDLUC3/development
...
Marta Ribeiro
authored
on 15 Jul 2016
GitHub
committed
on 15 Jul 2016
|