Merge branch 'release-2.2.3' into develop
This commit is contained in:
		@@ -1,3 +1,11 @@
 | 
				
			|||||||
 | 
					Version 2.2.3 (2016-03-30)
 | 
				
			||||||
 | 
					========================================================================
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					- REPARIERT: Installationsskript hat Add-in nicht aktiviert.
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * 
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					
 | 
				
			||||||
Version 2.2.2 (2016-03-29)
 | 
					Version 2.2.2 (2016-03-29)
 | 
				
			||||||
========================================================================
 | 
					========================================================================
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 
 | 
				
			|||||||
 Submodule deploy/VstoAddinInstaller updated: aa285e0ed2...f96d784a3a
									
								
							@@ -5,7 +5,7 @@
 | 
				
			|||||||
#define PUB_YEARS "2015-2016"
 | 
					#define PUB_YEARS "2015-2016"
 | 
				
			||||||
#define TARGET_HOST "word"
 | 
					#define TARGET_HOST "word"
 | 
				
			||||||
#define APP_GUID "{{8520B887-3AB1-422B-AB6B-A265D14FE4E5}"
 | 
					#define APP_GUID "{{8520B887-3AB1-422B-AB6B-A265D14FE4E5}"
 | 
				
			||||||
#define PRODUCT "zaaReloaded"
 | 
					#define ADDIN_NAME "zaaReloaded"
 | 
				
			||||||
#define COMPANY "Daniel Kraus (bovender)"
 | 
					#define COMPANY "Daniel Kraus (bovender)"
 | 
				
			||||||
#define DESCRIPTION "Word-Addin, das Lauris-Laborwerte in der Zentralen Arztbriefablage formatiert."
 | 
					#define DESCRIPTION "Word-Addin, das Lauris-Laborwerte in der Zentralen Arztbriefablage formatiert."
 | 
				
			||||||
#define HOMEPAGE "http://zaa.nephrowiki.de"
 | 
					#define HOMEPAGE "http://zaa.nephrowiki.de"
 | 
				
			||||||
 
 | 
				
			|||||||
@@ -368,7 +368,7 @@
 | 
				
			|||||||
 | 
					
 | 
				
			||||||
    <footer class="footer">
 | 
					    <footer class="footer">
 | 
				
			||||||
      <p>
 | 
					      <p>
 | 
				
			||||||
        © 2015 <a href="http://www.bovender.de">Daniel Kraus</a>
 | 
					        © 2015-2016 <a href="http://www.bovender.de">Daniel Kraus</a>
 | 
				
			||||||
        <span class="pull-right">
 | 
					        <span class="pull-right">
 | 
				
			||||||
          Handarbeit mit
 | 
					          Handarbeit mit
 | 
				
			||||||
          <a href="http://www.vim.org">
 | 
					          <a href="http://www.vim.org">
 | 
				
			||||||
 
 | 
				
			|||||||
@@ -1,4 +1,4 @@
 | 
				
			|||||||
2.2.2
 | 
					2.2.3
 | 
				
			||||||
http://zaa.nephrowiki.de/downloads/zaaReloaded-$VERSION.exe
 | 
					http://zaa.nephrowiki.de/downloads/zaaReloaded-$VERSION.exe
 | 
				
			||||||
06221d6b4b1882414daa439d5cc68a7a9b88b57c7a1b96b9184c6c8afc624eec  deploy/releases/zaaReloaded-2.2.2.exe
 | 
					077df8d43cf97ef4082cda988393734a825b51cf0e023527cdc5752502c83f03  deploy/releases/zaaReloaded-2.2.3.exe
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 
 | 
				
			|||||||
@@ -1,2 +1,2 @@
 | 
				
			|||||||
2.2.2
 | 
					2.2.3
 | 
				
			||||||
2.2.2.0
 | 
					2.2.3.0
 | 
				
			||||||
 
 | 
				
			|||||||
		Reference in New Issue
	
	Block a user