X-Git-Url: https://pere.pagekite.me/gitweb/homepage.git/blobdiff_plain/731de269dafd5a472cc57ec6aaa815c6ef289719..923b4898cf78ff810ace3dac6439e6656f30d5f5:/blog/The_many_definitions_of_a_open_standard.html diff --git a/blog/The_many_definitions_of_a_open_standard.html b/blog/The_many_definitions_of_a_open_standard.html index b64d8cd97d..accef6cc5b 100644 --- a/blog/The_many_definitions_of_a_open_standard.html +++ b/blog/The_many_definitions_of_a_open_standard.html @@ -274,7 +274,11 @@ Standards.

  • August (6)
    • +<<<<<<< The_many_definitions_of_a_open_standard.html +
  • September (3)
    • +=======
  • September (2)
    • +>>>>>>> 1.62 @@ -388,7 +392,11 @@ Standards.

  • multimedia (13)
    • +<<<<<<< The_many_definitions_of_a_open_standard.html +
  • norsk (137)
    • +=======
  • norsk (136)
    • +>>>>>>> 1.62
  • nuug (119)
    • @@ -418,8 +426,13 @@ Standards.

  • surveillance (9)
    • +<<<<<<< The_many_definitions_of_a_open_standard.html +
  • valg (6)
    • + +=======
  • valg (5)
    • +>>>>>>> 1.62
  • video (20)
  • vitenskap (1)