Commit graph

62 commits

Author SHA1 Message Date
rehrar
b07fcb93c0 Merge pull request #4 from monero-project/master
Merge recent merges
2017-07-07 14:10:42 -06:00
Riccardo Spagni
8af5f5d0ec Merge pull request #284 from erciccione/patch-2
fix broken links merchants.yml + what-is-monero
2017-07-07 18:06:01 +02:00
Riccardo Spagni
c6e9f1be1c Merge pull request #305 from jonathancross/forum-link
[urgent] Fix user-facing broken forum links
2017-07-07 18:04:34 +02:00
rehrar
081f5d2471 FFS Finished
- Added Milestone capabilities
- Added and custom styled comments
2017-07-07 08:17:56 -06:00
Jonathan Cross
fae75edaf8
[urgent] Fix user-facing broken forum links 2017-07-07 03:02:15 +02:00
erciccione
b423d59cdb
fix missing link what-is-monero 2017-07-06 13:30:04 +01:00
brnls
e03bc87860 Update index.md
typo fix
2017-07-05 09:29:02 -07:00
Riccardo Spagni
50c8548319
Merge pull request #296
c57d24f Update index.md (SamsungGalaxyPlayer)
2017-07-05 11:45:10 +02:00
rehrar
7ab67bce26 Made correction to FFS revert
- Added https:// otherwise it wouldn't redirect properly.
2017-07-04 20:30:06 -06:00
SamsungGalaxyPlayer
c57d24fbd7 Update index.md 2017-07-04 21:11:03 +02:00
rehrar
70255b6dcf Reverted FFS links
- Reverted link in Contributing to forum.getmonero.org
- Reverted header links to forum.getmonero.org
2017-07-04 10:30:10 -06:00
rehrar
4e41a6a0cf Added new site 2017-07-04 00:00:32 -06:00