kompot
/
publiccode.si
5
3
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
publiccode.si/site/data/en/resources
History
Marc Horne 3c8cbb3235 Merge branch 'master' of git.fsfe.org:pmpc/website into feature/restyle 
# Conflicts:
#	static/css/custom.css
 		2017-06-20 18:49:47 +02:00
..
1-PublicAdmin.yaml Merge branch 'master' of git.fsfe.org:pmpc/website into feature/restyle 2017-06-20 18:49:47 +02:00
2-Public.yaml Merge branch 'master' of git.fsfe.org:pmpc/website into feature/restyle 2017-06-20 18:49:47 +02:00
3-Action.yaml Merge branch 'master' of git.fsfe.org:pmpc/website into feature/restyle 2017-06-20 18:49:47 +02:00
4-News.yaml Merge branch 'master' of git.fsfe.org:pmpc/website into feature/restyle 2017-06-20 18:49:47 +02:00
5-FOI.yaml Merge branch 'master' of git.fsfe.org:pmpc/website into feature/restyle 2017-06-20 18:49:47 +02:00
6-Press.yaml Merge branch 'master' of git.fsfe.org:pmpc/website into feature/restyle 2017-06-20 18:49:47 +02:00