Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Feature/collaboration links footer #450

Merged
merged 5 commits into from
Sep 21, 2015

Conversation

55
Copy link
Contributor

@55 55 commented Sep 9, 2015

Added a block in footer about Sampo and API Umbrella collaboration

@@ -2,7 +2,7 @@
<footer>
<div class="container">
<div class="row">
<div class="col-lg-10">
<div class="col-lg-2">
<ul class="list-inline social-icons icon-circle">
<li><a href="https://twitter.com/APInf_Suomi"><i class="fa fa-twitter"></i></a>
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This should be changed to https://twitter.com/apinf_io

illya nizyev and others added 2 commits September 15, 2015 10:42
…ion-links-footer

Conflicts:
	client/views/home/footer/home_footer.html
@55
Copy link
Contributor Author

55 commented Sep 19, 2015

Fixed, ready to be merged.

brylie added a commit that referenced this pull request Sep 21, 2015
@brylie brylie merged commit 5a0d084 into develop Sep 21, 2015
@brylie brylie deleted the feature/collaboration-links-footer branch September 21, 2015 10:22
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

2 participants