Skip to content

Development -> Master - #2195

Merged
xsrust merged 2 commits into
masterfrom
development
Jul 29, 2019
Merged

Development -> Master#2195
xsrust merged 2 commits into
masterfrom
development

Conversation

@xsrust

@xsrust xsrust commented Jul 29, 2019

Copy link
Copy Markdown
Contributor

Fixes issue with Travis config

@xsrust
xsrust merged commit f647e26 into master Jul 29, 2019
xsrust added a commit to DigitalCurationCentre/roadmap that referenced this pull request Aug 1, 2019
* updated plan sharing form according to DMPRoadmap#2111, also added text to the email field to clarify what happens if the user is not in our system

* added gettext markup

* rebased off development, added devise.rb back to gitignore

* changed tooltip text to use app name from branding

* trying explicit definition of db_services (DMPRoadmap#2195)
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

1 participant