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

version #3

Merged
merged 7 commits into from
Jun 19, 2015
Merged

version #3

merged 7 commits into from
Jun 19, 2015

Conversation

alialamshahi
Copy link
Owner

No description provided.

alialamshahi added a commit that referenced this pull request Jun 19, 2015
@alialamshahi alialamshahi merged commit 1f4036f into 1.0 Jun 19, 2015
…-Tino

Conflicts:
	themes/tino/css/style.css
	themes/tino/templates/Includes/Footer.ss
…-Tino

Conflicts:
	themes/tino/css/style.css
	themes/tino/templates/Includes/Footer.ss
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

1 participant