Skip to content

P

Projects
G

Groups
S

Snippets
Help

yotta / pictogram

This project
Loading...
Sign in

Go to a project

Project
Repository
Issues 60
Merge Requests 0
Pipelines
Wiki
Settings
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards

Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts

Blame History Permalink

Switch branch/tag

pictogram
sails
src
assets
styles
main.css

Merge remote-tracking branch 'refs/remotes/origin/develop' · 34c610d3
```
Conflicts:
	sails/src/assets/styles/main.css
```
Jose Antonio committed Mar 08, 2017
34c610d3

main.css 18.1 KB