diff options
| author | Gustav Eek <gustav.eek@proceranetworks.com> | 2013-04-20 09:28:25 +0200 |
|---|---|---|
| committer | Gustav Eek <gustav.eek@proceranetworks.com> | 2013-04-20 09:28:25 +0200 |
| commit | 333ce0e77e9ed4471070b2cbc856edc29cd800ca (patch) | |
| tree | c7b6fcb1da08ea68d3f47f74dcb09fc0641410d0 /resources | |
| parent | cf84992f282bd9a1cbac21e525175e466328056f (diff) | |
| parent | 07d3de541c5eb163bdb563f0fb4489d92d53f899 (diff) | |
Merge branch 'ge-annual'
Conflicts:
2013/Makefile
Diffstat (limited to 'resources')
| -rw-r--r-- | resources/board-minutes-template-en.tex | 1 | ||||
| -rw-r--r-- | resources/board-minutes-template-sv.tex | 1 |
2 files changed, 2 insertions, 0 deletions
diff --git a/resources/board-minutes-template-en.tex b/resources/board-minutes-template-en.tex index fc20d16..51ca933 100644 --- a/resources/board-minutes-template-en.tex +++ b/resources/board-minutes-template-en.tex @@ -44,6 +44,7 @@ % Taraka Rama \\ % Dan Ros\'en\\ % Stian Rødven Eide \\ +% Andreas Skyman \\ % Johan Söderberg % Ver Takeo \\ % Eva Werner diff --git a/resources/board-minutes-template-sv.tex b/resources/board-minutes-template-sv.tex index 9f7a5d7..95450a4 100644 --- a/resources/board-minutes-template-sv.tex +++ b/resources/board-minutes-template-sv.tex @@ -45,6 +45,7 @@ % Taraka Rama \\ % Dan Ros\'en\\ % Stian Rødven Eide \\ +% Andreas Skyman \\ % Johan Söderberg % Ver Takeo \\ % Eva Werner |