X-Git-Url: https://jfr.im/git/irc/freenode/web-7.0.git/blobdiff_plain/15d5b931e5d4e63ca13edc423896c85d7dd31007..b74d2de1202dc8c43b9d4e08d6760db9edb16f30:/index_mock1.html diff --git a/index_mock1.html b/index_mock1.html index 05239a239..236f08e26 100644 --- a/index_mock1.html +++ b/index_mock1.html @@ -1,116 +1,220 @@ + - - + + + + freenode - + + + + + +
-
-

Welcome to the new home of your projects.

-

freenode aims to maximize efficiency in development by allowing a collaborative and relaxed environment for developers while allowing users to get an answer for their problems.

- -
-<<<<<<< HEAD -
- chat
- Join a community -
-
- group
- Get my project on freenode -
-
- support
- Support freenode -
-======= -

I want to...

+

Welcome to freenode, the new home of your + projects.

+ + ->>>>>>> a76ce2ec5a7fbf382a09e6e87b16841374fe28a0
- + +
-

News

-

Some News

-

2016-02-21 by spb

-

Fancy news article's ingress text here. Lorem ipsum dolor sit amet, consectetur adipiscing elit. Phasellus placerat ultricies euismod. Maecenas dolor mauris, posuere mollis eros vel, auctor rhoncus quam...

- +

Some News 2016-02-19 by christel

+ +

Fancy news article's ingress text here. + Lorem ipsum dolor sit amet, consectetur adipiscing elit. + Phasellus placerat ultricies euismod. Maecenas dolor mauris, + posuere mollis eros vel, auctor rhoncus quam...

+ + +
+ +
-

Another News

-

2016-01-19 by christel

-

Some other news article's ingress here. Phasellus nec erat rhoncus, pretium orci eget, ullamcorper ipsum. Fusce sit amet felis a augue sodales commodo id eget justo. Phasellus id nisl nec elit porta pellentesque in egestas nibh. Vivamus mollis ligula lectus, in mollis nibh pharetra vitae...

- +

Another News + + + 2016-01-19 by christel

+ + +

Some other news article's ingress here. + Phasellus nec erat rhoncus, pretium orci eget, ullamcorper + ipsum. Fusce sit amet felis a augue sodales commodo id eget + justo. Phasellus id nisl nec elit porta pellentesque in egestas + nibh. Vivamus mollis ligula lectus, in mollis nibh pharetra + vitae...

+ + +
-<<<<<<< HEAD - -