centos.org website repository
rbowen
7 days ago deb589dcbc7da7e2723e9ad3cfeb446114b1a56c
refs
author rbowen <rbowen@rcbowen.com>
Monday, May 14, 2018 18:45 +0000
committer rbowen <rbowen@rcbowen.com>
Monday, May 14, 2018 18:45 +0000
commitdeb589dcbc7da7e2723e9ad3cfeb446114b1a56c
tree 4af683daa12c3ce200c9446a5f95306ec015291e tree | zip | gz | bzip2
parent 2d50ac9b45e031c96e33275b91e4e548fdddf269 view | diff
db787f1a4e5668ee0c4a827a1de41174c83710fe view | diff
Fix conflicting change.
4 files added
1 files deleted
2 files modified
209 ■■■■ changed files
content/community/irc-meetings.ics 183 ●●●●● diff | view | raw | blame | history
content/download.haml 6 ●●●● diff | view | raw | blame | history
content/index.erb 2 ●●● diff | view | raw | blame | history
content/sponsors/itsyndicate.erb 9 ●●●●● diff | view | raw | blame | history
content/sponsors/riverfrontnetworks.erb 9 ●●●●● diff | view | raw | blame | history
static/images/sponsors/itsyndicate.png diff | view | raw | blame | history
static/images/sponsors/riverfrontnetworks.png diff | view | raw | blame | history